From: Apple <opensource@apple.com>
Date: Tue, 5 Jan 2010 23:07:46 +0000 (+0000)
Subject: securityd-37613.tar.gz
X-Git-Tag: v37613^0
X-Git-Url: https://git.saurik.com/apple/securityd.git/commitdiff_plain/73f561dd7d3848f043bdf7efcefdff031c234410

securityd-37613.tar.gz
---

diff --git a/securityd.xcodeproj/project.pbxproj b/securityd.xcodeproj/project.pbxproj
index 3df9991..82fe6d7 100644
--- a/securityd.xcodeproj/project.pbxproj
+++ b/securityd.xcodeproj/project.pbxproj
@@ -959,7 +959,7 @@
 				BUILD_VARIANTS = debug;
 				COPY_PHASE_STRIP = NO;
 				CSSM_HEADERS = "$(BUILT_PRODUCTS_DIR)/Security.framework/Headers:$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Headers";
-				CURRENT_PROJECT_VERSION = 37180;
+				CURRENT_PROJECT_VERSION = 37613;
 				FRAMEWORK_SEARCH_PATHS = (
 					/usr/local/SecurityPieces/Frameworks,
 					/usr/local/SecurityPieces/Components/securityd,
@@ -1012,7 +1012,7 @@
 				);
 				COPY_PHASE_STRIP = "(null)";
 				CSSM_HEADERS = "$(BUILT_PRODUCTS_DIR)/Security.framework/Headers:$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Headers";
-				CURRENT_PROJECT_VERSION = 37180;
+				CURRENT_PROJECT_VERSION = 37613;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
 					/usr/local/SecurityPieces/Frameworks,
@@ -1063,7 +1063,7 @@
 				BUILD_VARIANTS = normal;
 				COPY_PHASE_STRIP = NO;
 				CSSM_HEADERS = "$(BUILT_PRODUCTS_DIR)/Security.framework/Headers:$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Headers";
-				CURRENT_PROJECT_VERSION = 37180;
+				CURRENT_PROJECT_VERSION = 37613;
 				FRAMEWORK_SEARCH_PATHS = (
 					/usr/local/SecurityPieces/Frameworks,
 					/usr/local/SecurityPieces/Components/securityd,
@@ -1117,7 +1117,7 @@
 				);
 				COPY_PHASE_STRIP = "(null)";
 				CSSM_HEADERS = "";
-				CURRENT_PROJECT_VERSION = 37180;
+				CURRENT_PROJECT_VERSION = 37613;
 				FRAMEWORK_SEARCH_PATHS = (
 					/usr/local/SecurityPieces/Frameworks,
 					/usr/local/SecurityPieces/Components/securityd,
diff --git a/src/transition.cpp b/src/transition.cpp
index f97237b..09a01b8 100644
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -287,6 +287,16 @@ kern_return_t ucsp_server_verifyPrivileged(UCSP_ARGS)
 	return KERN_SUCCESS;
 }
 
+kern_return_t ucsp_server_verifyPrivileged2(UCSP_ARGS, mach_port_t *originPort)
+{
+	BEGIN_IPCN
+	SECURITYD_REQUEST_ENTRY((char*)"verifyPrivileged2", NULL, NULL);
+	// send the port back to the sender to check for a MitM (6986198)
+	*originPort = servicePort;
+	END_IPCN(CSSM)
+	return KERN_SUCCESS;
+}
+
 //
 // Common database operations
 //