securityd-29035.tar.gz

diff --git a/etc/CodeEquivalenceCandidates b/etc/CodeEquivalenceCandidates
index 01914b6675b41f9ea1c1467ca8c26096ca4436a3..5404062d0d0b36f3db0ea72d01955b9a77350e65 100644 (file)
--- a/etc/CodeEquivalenceCandidates
+++ b/etc/CodeEquivalenceCandidates
@@ -58,6 +58,7 @@
 /usr/bin/crlrefresh
 /usr/bin/security
 /usr/bin/smbutil
 /usr/bin/crlrefresh
 /usr/bin/security
 /usr/bin/smbutil

+/usr/libexec/airportd

 /usr/local/bin/cmsutil
 /usr/sbin/configd    
 /usr/sbin/pppd
 /usr/local/bin/cmsutil
 /usr/sbin/configd    
 /usr/sbin/pppd

diff --git a/etc/startup.mk b/etc/startup.mk
index 021f90f863898df5f294e298a975eae1fac55c51..f3912c30f749ccb3aae80d01616bf2e0231e1f2a 100644 (file)
--- a/etc/startup.mk
+++ b/etc/startup.mk
@@ -37,7 +37,7 @@ install:
        cp $(SRC)/securityd.plist $(SRC)/securityd-installCD.plist $(DST)
        mkdir -p $(AUTHORIZATION_LOCATION)
        cp $(SRC)/authorization.plist $(AUTHORIZATION_PLIST)
        cp $(SRC)/securityd.plist $(SRC)/securityd-installCD.plist $(DST)
        mkdir -p $(AUTHORIZATION_LOCATION)
        cp $(SRC)/authorization.plist $(AUTHORIZATION_PLIST)

-       chown root:admin $(AUTHORIZATION_PLIST)
+       chown root:wheel $(AUTHORIZATION_PLIST)

        chmod 644 $(AUTHORIZATION_PLIST)
        mkdir -p $(VARDB)
        cp $(SRC)/CodeEquivalenceCandidates $(CANDIDATES)
        chmod 644 $(AUTHORIZATION_PLIST)
        mkdir -p $(VARDB)
        cp $(SRC)/CodeEquivalenceCandidates $(CANDIDATES)

diff --git a/securityd.xcode/project.pbxproj b/securityd.xcode/project.pbxproj
index 2cbf2f2bb921547c59464bfa175a56aa7025b5b3..00bde5dc1b8b693c0aec24e8c2b29b06304d991e 100644 (file)
--- a/securityd.xcode/project.pbxproj
+++ b/securityd.xcode/project.pbxproj
@@ -836,7 +836,7 @@
                        );
                        buildSettings = {
                                BUILD_VARIANTS = "normal debug";
                        );
                        buildSettings = {
                                BUILD_VARIANTS = "normal debug";

-                               CURRENT_PROJECT_VERSION = 27896;
+                               CURRENT_PROJECT_VERSION = 29035;

                                FRAMEWORK_SEARCH_PATHS = "/usr/local/SecurityPieces/Frameworks /usr/local/SecurityPieces/Components/securityd $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                INSTALL_PATH = /usr/sbin;
                                OPT_CPPXFLAGS = "$(OPT_CXFLAGS)";
                                FRAMEWORK_SEARCH_PATHS = "/usr/local/SecurityPieces/Frameworks /usr/local/SecurityPieces/Components/securityd $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                INSTALL_PATH = /usr/sbin;
                                OPT_CPPXFLAGS = "$(OPT_CXFLAGS)";

diff --git a/src/transition.cpp b/src/transition.cpp
index 79f708e6b5b729bb9bb8feb1637671f6cd24fcdf..c83169ba5a7fd51e7034f62463e82472a2acc750 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -218,6 +218,10 @@ kern_return_t ucsp_server_findFirst(UCSP_ARGS, DbHandle db,
 
                // return data (temporary fix)
                if (getData) {
 
                // return data (temporary fix)
                if (getData) {

+                       if (key) {
+                               flip (*outData.interpretedAs<CssmKey>());
+                       }
+                       

                        *data = outData.data();
                        *dataLength = outData.length();
                }
                        *data = outData.data();
                        *dataLength = outData.length();
                }


@@ -257,6 +261,10 @@ kern_return_t ucsp_server_findNext(UCSP_ARGS, SearchHandle hSearch,
 
                // return data (temporary fix)
                if (getData) {
 
                // return data (temporary fix)
                if (getData) {

+                       if (key) {
+                               flip (*outData.interpretedAs<CssmKey>());
+                       }
+                       

                        *data = outData.data();
                        *dataLength = outData.length();
                }
                        *data = outData.data();
                        *dataLength = outData.length();
                }


@@ -288,6 +296,10 @@ kern_return_t ucsp_server_findRecordHandle(UCSP_ARGS, RecordHandle hRecord,
 
        // return data (temporary fix)
        if (getData) {
 
        // return data (temporary fix)
        if (getData) {

+               if (key) {
+                       flip (*outData.interpretedAs<CssmKey>());
+               }
+                       

                *data = outData.data();
                *dataLength = outData.length();
        }
                *data = outData.data();
                *dataLength = outData.length();
        }