Security-55471.14.8.tar.gz

diff --git a/CloudKeychainProxy/CloudKeychainProxy-Info.plist b/CloudKeychainProxy/CloudKeychainProxy-Info.plist
index 4b3a1ba465db6ec4eed51dc4949c9faccc61dc36..753b00e358061e692a72b318408833627d41ff14 100644 (file)
--- a/CloudKeychainProxy/CloudKeychainProxy-Info.plist
+++ b/CloudKeychainProxy/CloudKeychainProxy-Info.plist
@@ -21,7 +21,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>55471.14.4</string>
+       <string>55471.14.8</string>

        <key>NSHumanReadableCopyright</key>
        <string>Copyright © 2013 Apple, Inc. All rights reserved.</string>
 </dict>
        <key>NSHumanReadableCopyright</key>
        <string>Copyright © 2013 Apple, Inc. All rights reserved.</string>
 </dict>

diff --git a/Keychain Circle Notification/Keychain Circle Notification-Info.plist b/Keychain Circle Notification/Keychain Circle Notification-Info.plist
index 471548b6f284232e18d86a3c930c78c500a290b0..a7c85cbda5504c2fcf88bbcc92eed8618a08270f 100644 (file)
--- a/Keychain Circle Notification/Keychain Circle Notification-Info.plist
+++ b/Keychain Circle Notification/Keychain Circle Notification-Info.plist
@@ -21,7 +21,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>55471.14.4</string>
+       <string>55471.14.8</string>

        <key>LSApplicationCategoryType</key>
        <string></string>
        <key>LSMinimumSystemVersion</key>
        <key>LSApplicationCategoryType</key>
        <string></string>
        <key>LSMinimumSystemVersion</key>

diff --git a/Keychain/Keychain-Info.plist b/Keychain/Keychain-Info.plist
index 0b234892b11c1099b3fcebeecfd735ce35cf289a..db90fc621ad35653247c720cb1080241ce291297 100644 (file)
--- a/Keychain/Keychain-Info.plist
+++ b/Keychain/Keychain-Info.plist
@@ -21,7 +21,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>55471.14.4</string>
+       <string>55471.14.8</string>

        <key>LSMinimumSystemVersion</key>
        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
        <key>NSMainNibFile</key>
        <key>LSMinimumSystemVersion</key>
        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
        <key>NSMainNibFile</key>

diff --git a/authd/Info.plist b/authd/Info.plist
index 55e7c8430fa0cde2b16bfa100bf90268414f209d..4169be64a4d43e7862ac6ff426c017cb614fa282 100644 (file)
--- a/authd/Info.plist
+++ b/authd/Info.plist
@@ -19,7 +19,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>55471.14.4</string>
+       <string>55471.14.8</string>

        <key>NSHumanReadableCopyright</key>
        <string>Copyright © 2012 Apple. All rights reserved.</string>
        <key>XPCService</key>
        <key>NSHumanReadableCopyright</key>
        <string>Copyright © 2012 Apple. All rights reserved.</string>
        <key>XPCService</key>

diff --git a/lib/Info-Security.plist b/lib/Info-Security.plist
index 1bd358d96e52f5f05fa105ad49374394886f5a13..72270a74c7d96c563f76600edfc4b6d542fce910 100644 (file)
--- a/lib/Info-Security.plist
+++ b/lib/Info-Security.plist
@@ -19,6 +19,6 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>55471.14.4</string>
+       <string>55471.14.8</string>

 </dict>
 </plist>
 </dict>
 </plist>

diff --git a/lib/plugins/csparser-Info.plist b/lib/plugins/csparser-Info.plist
index 21b388561a77fb7ed05176a241b2267708251c79..76a993e0ee4725311bf6196503f3391a42dee28e 100644 (file)
--- a/lib/plugins/csparser-Info.plist
+++ b/lib/plugins/csparser-Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>55471.14.4</string>
+       <string>55471.14.8</string>

        <key>CFBundleShortVersionString</key>
        <string>3.0</string>
 </dict>
        <key>CFBundleShortVersionString</key>
        <string>3.0</string>
 </dict>

diff --git a/lib/security.exp-in b/lib/security.exp-in
index 585b1198b66728918d51fc9e4430e9e277235ffd..4e0838c20c3bbd3630966718b336125f85826783 100644 (file)
--- a/lib/security.exp-in
+++ b/lib/security.exp-in
@@ -2200,3 +2200,12 @@ _kSecPasswordSeparator
 // utilities
 //
 _add_security_log_hanlder
 // utilities
 //
 _add_security_log_hanlder

+
+// gate keeper logging
+
+_GKBIS_DS_Store_Present
+_GKBIS_Dot_underbar_Present
+_GKBIS_Num_localizations
+_GKBIS_Num_files
+_GKBIS_Num_dirs
+_GKBIS_Num_symlinks

diff --git a/libsecurity_codesigning/lib/StaticCode.cpp b/libsecurity_codesigning/lib/StaticCode.cpp
index 62bfe21544644dd72d73c02f3085991b3e7dc5d6..2f6b48d2eeb344511ada813abcb52e7f41c76a3c 100644 (file)
--- a/libsecurity_codesigning/lib/StaticCode.cpp
+++ b/libsecurity_codesigning/lib/StaticCode.cpp
@@ -243,6 +243,7 @@ void SecStaticCode::resetValidity()
        mEntitlements = NULL;
        mResourceDict = NULL;
        mDesignatedReq = NULL;
        mEntitlements = NULL;
        mResourceDict = NULL;
        mDesignatedReq = NULL;

+       mCDHash = NULL;

        mGotResourceBase = false;
        mTrust = NULL;
        mCertChain = NULL;
        mGotResourceBase = false;
        mTrust = NULL;
        mCertChain = NULL;

diff --git a/libsecurity_codesigning/lib/machorep.cpp b/libsecurity_codesigning/lib/machorep.cpp
index b3ed84372777abaadc95d3d45a61ffac70b4e690..2130171d7659bb8d01a55899cf51aacf9811d189 100644 (file)
--- a/libsecurity_codesigning/lib/machorep.cpp
+++ b/libsecurity_codesigning/lib/machorep.cpp
@@ -247,12 +247,13 @@ string MachORep::format()
 //
 void MachORep::flush()
 {
 //
 void MachORep::flush()
 {

+       size_t offset = mExecutable->offset();

        delete mExecutable;
        mExecutable = NULL;
        ::free(mSigningData);
        mSigningData = NULL;
        SingleDiskRep::flush();
        delete mExecutable;
        mExecutable = NULL;
        ::free(mSigningData);
        mSigningData = NULL;
        SingleDiskRep::flush();

-       mExecutable = new Universal(fd());
+       mExecutable = new Universal(fd(), offset);

 }
 
 
 }
 
 

diff --git a/libsecurity_codesigning/lib/policyengine.cpp b/libsecurity_codesigning/lib/policyengine.cpp
index 31f1182197cd316f3e776e9173270fcd23837895..e3b6fe8e208adcf8769780ff8125330112c33fdf 100644 (file)
--- a/libsecurity_codesigning/lib/policyengine.cpp
+++ b/libsecurity_codesigning/lib/policyengine.cpp
@@ -78,6 +78,42 @@ PolicyEngine::PolicyEngine()
 PolicyEngine::~PolicyEngine()
 { }
 
 PolicyEngine::~PolicyEngine()
 { }
 

+#define GKBIS_XPC_SERVICE_NAME "com.apple.gkbisd"
+#define GKBIS_REQUEST_KEY_PATH "path"
+#define GKBIS_REQUEST_KEY_DEFER "defer"
+#define GKBIS_REQUEST_KEY_QUARANTINED "quarantined"
+
+static void
+gkbis_invoke_collector(const char *path)
+{
+       dispatch_queue_t queue = dispatch_queue_create("gkbis_invoke_collector", NULL);
+       dispatch_group_t group = dispatch_group_create();
+       /* Set up a connection to gkbisd. */
+       xpc_connection_t connection = xpc_connection_create_mach_service(GKBIS_XPC_SERVICE_NAME,
+                                                                                                                                        queue, XPC_CONNECTION_MACH_SERVICE_PRIVILEGED);
+       xpc_connection_set_event_handler(connection, ^(xpc_object_t event) {
+       });
+       xpc_connection_resume(connection);
+
+       /* Construct and send the request. */
+       xpc_object_t message = xpc_dictionary_create(NULL, NULL, 0);
+       xpc_dictionary_set_string(message, GKBIS_REQUEST_KEY_PATH, path);
+    xpc_dictionary_set_bool(message, GKBIS_REQUEST_KEY_QUARANTINED, true);
+       xpc_dictionary_set_bool(message, GKBIS_REQUEST_KEY_DEFER, true);
+       xpc_connection_send_message(connection, message);
+       xpc_release(message);
+       /* Cancel the connection after the request has been sent. */
+       dispatch_group_enter(group);
+       xpc_connection_send_barrier(connection, ^{
+               xpc_connection_cancel(connection);
+               xpc_release(connection);
+               dispatch_group_leave(group);
+       });
+       /* Wait until the connection is canceled. */
+       dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
+       dispatch_release(queue);
+       dispatch_release(group);
+}

 
 //
 // Top-level evaluation driver
 
 //
 // Top-level evaluation driver


@@ -89,6 +125,7 @@ void PolicyEngine::evaluate(CFURLRef path, AuthorityType type, SecAssessmentFlag
 
        switch (type) {
        case kAuthorityExecute:
 
        switch (type) {
        case kAuthorityExecute:

+               gkbis_invoke_collector(cfString(path).c_str());

                evaluateCode(path, kAuthorityExecute, flags, context, result, true);
                break;
        case kAuthorityInstall:
                evaluateCode(path, kAuthorityExecute, flags, context, result, true);
                break;
        case kAuthorityInstall:

diff --git a/libsecurity_codesigning/lib/resources.cpp b/libsecurity_codesigning/lib/resources.cpp
index e5c50a49bedc7b652c8433be4a6ed22db0257502..0ac68ecb7be5abeca10f313a359e3eb8493e7e62 100644 (file)
--- a/libsecurity_codesigning/lib/resources.cpp
+++ b/libsecurity_codesigning/lib/resources.cpp
@@ -32,6 +32,17 @@
 #include <security_utilities/unix++.h>
 #include <security_utilities/cfmunge.h>
 
 #include <security_utilities/unix++.h>
 #include <security_utilities/cfmunge.h>
 

+// These are pretty nasty, but are a quick safe fix
+// to pass information down to the gatekeeper collection tool
+extern "C" {
+    int GKBIS_DS_Store_Present;
+       int GKBIS_Dot_underbar_Present;
+       int GKBIS_Num_localizations;
+       int GKBIS_Num_files;
+       int GKBIS_Num_dirs;
+       int GKBIS_Num_symlinks;
+}
+

 namespace Security {
 namespace CodeSigning {
 
 namespace Security {
 namespace CodeSigning {
 


@@ -93,6 +104,16 @@ void ResourceBuilder::addRule(CFTypeRef key, CFTypeRef value)
        addRule(new Rule(pattern, weight, flags));
 }
 
        addRule(new Rule(pattern, weight, flags));
 }
 

+static bool findStringEndingNoCase(const char *path, const char * end)
+{
+    size_t len_path = strlen(path);
+    size_t len_end = strlen(end);
+    
+    if (len_path >= len_end) {
+        return strcasecmp(path + (len_path - len_end), end) == 0;
+    } else
+        return false;
+}

 
 //
 // Locate the next non-ignored file, look up its rule, and return it.
 
 //
 // Locate the next non-ignored file, look up its rule, and return it.


@@ -101,11 +122,23 @@ void ResourceBuilder::addRule(CFTypeRef key, CFTypeRef value)
 void ResourceBuilder::scan(Scanner next)
 {
        bool first = true;
 void ResourceBuilder::scan(Scanner next)
 {
        bool first = true;

+    

        while (FTSENT *ent = fts_read(mFTS)) {
                const char *relpath = ent->fts_path + mRoot.size() + 1; // skip prefix + "/"
                switch (ent->fts_info) {
                case FTS_F:
                        secdebug("rdirenum", "file %s", ent->fts_path);
        while (FTSENT *ent = fts_read(mFTS)) {
                const char *relpath = ent->fts_path + mRoot.size() + 1; // skip prefix + "/"
                switch (ent->fts_info) {
                case FTS_F:
                        secdebug("rdirenum", "file %s", ent->fts_path);

+                       GKBIS_Num_files++;
+                
+                       // These are checks for the gatekeeper collection
+                       static const char underbar[] = "._";
+                       if (strncasecmp(ent->fts_name, underbar, strlen(underbar)) == 0)
+                               GKBIS_Dot_underbar_Present++;
+
+                       static const char ds_store[] = ".DS_Store";
+                       if (strcasecmp(ent->fts_name, ds_store) == 0)
+                               GKBIS_DS_Store_Present++;
+

                        if (Rule *rule = findRule(relpath))
                                if (!(rule->flags & (omitted | exclusion)))
                                        next(ent, rule->flags, relpath, rule);
                        if (Rule *rule = findRule(relpath))
                                if (!(rule->flags & (omitted | exclusion)))
                                        next(ent, rule->flags, relpath, rule);


@@ -113,12 +146,16 @@ void ResourceBuilder::scan(Scanner next)
                case FTS_SL:
                        // symlinks cannot ever be nested code, so quietly convert to resource file
                        secdebug("rdirenum", "symlink %s", ent->fts_path);
                case FTS_SL:
                        // symlinks cannot ever be nested code, so quietly convert to resource file
                        secdebug("rdirenum", "symlink %s", ent->fts_path);

+                       GKBIS_Num_symlinks++;
+                

                        if (Rule *rule = findRule(relpath))
                                if (!(rule->flags & (omitted | exclusion)))
                                        next(ent, rule->flags & ~nested, relpath, rule);
                        break;
                case FTS_D:
                        secdebug("rdirenum", "entering %s", ent->fts_path);
                        if (Rule *rule = findRule(relpath))
                                if (!(rule->flags & (omitted | exclusion)))
                                        next(ent, rule->flags & ~nested, relpath, rule);
                        break;
                case FTS_D:
                        secdebug("rdirenum", "entering %s", ent->fts_path);

+                       GKBIS_Num_dirs++;
+

                        if (!first) {   // skip root directory (relpath invalid)
                                if (Rule *rule = findRule(relpath)) {
                                        if (rule->flags & nested) {
                        if (!first) {   // skip root directory (relpath invalid)
                                if (Rule *rule = findRule(relpath)) {
                                        if (rule->flags & nested) {


@@ -132,7 +169,11 @@ void ResourceBuilder::scan(Scanner next)
                                        // else treat as normal directory and descend into it
                                }
                        }
                                        // else treat as normal directory and descend into it
                                }
                        }

+                       // Report the number of localizations
+                       if (findStringEndingNoCase(ent->fts_name, ".lproj"))
+                               GKBIS_Num_localizations++;

                        first = false;
                        first = false;

+

                        break;
                case FTS_DP:
                        secdebug("rdirenum", "leaving %s", ent->fts_path);
                        break;
                case FTS_DP:
                        secdebug("rdirenum", "leaving %s", ent->fts_path);

diff --git a/libsecurity_codesigning/lib/security_codesigning.exp b/libsecurity_codesigning/lib/security_codesigning.exp
index d6f20463c4afda209dc552c98ce52e2694f47af7..1bb8bfdf2fc7a4901c4cf3b7401c1111cc3f983c 100644 (file)
--- a/libsecurity_codesigning/lib/security_codesigning.exp
+++ b/libsecurity_codesigning/lib/security_codesigning.exp
@@ -162,3 +162,12 @@ _kSecAssessmentAssessmentAuthorityOverride
 _kSecAssessmentAssessmentOriginalVerdict
 _kSecAssessmentAssessmentSource
 _kSecAssessmentAssessmentVerdict
 _kSecAssessmentAssessmentOriginalVerdict
 _kSecAssessmentAssessmentSource
 _kSecAssessmentAssessmentVerdict

+
+# gatekeeper logging
+
+_GKBIS_DS_Store_Present
+_GKBIS_Dot_underbar_Present
+_GKBIS_Num_localizations
+_GKBIS_Num_files
+_GKBIS_Num_dirs
+_GKBIS_Num_symlinks

diff --git a/libsecurity_ssl/lib/SSLRecordInternal.c b/libsecurity_ssl/lib/SSLRecordInternal.c
index ac07e445863753bd8203e338110046ec4244c60d..d7de1fcb6f94c10ee5696b8418287263eb86989b 100644 (file)
--- a/libsecurity_ssl/lib/SSLRecordInternal.c
+++ b/libsecurity_ssl/lib/SSLRecordInternal.c
@@ -306,7 +306,7 @@ static int SSLRecordReadInternal(SSLRecordContextRef ref, SSLRecord *rec)
     rec->protocolVersion = (SSLProtocolVersion)SSLDecodeInt(charPtr, 2);
     charPtr += 2;
 
     rec->protocolVersion = (SSLProtocolVersion)SSLDecodeInt(charPtr, 2);
     charPtr += 2;
 

-    if(rec->protocolVersion == DTLS_Version_1_0)
+    if(ctx->isDTLS)

     {
         sslUint64 seqNum;
         SSLDecodeUInt64(charPtr, 8, &seqNum);
     {
         sslUint64 seqNum;
         SSLDecodeUInt64(charPtr, 8, &seqNum);

diff --git a/libsecurity_ssl/regressions/ssl-43-ciphers.c b/libsecurity_ssl/regressions/ssl-43-ciphers.c
index 92afa7e4f82dae183919a1cf6b4a19f1d6538098..1030a2813961b04e58ec668840f0cb1270e03dca 100644 (file)
--- a/libsecurity_ssl/regressions/ssl-43-ciphers.c
+++ b/libsecurity_ssl/regressions/ssl-43-ciphers.c
@@ -85,7 +85,7 @@ static struct {
     { OPENSSL_SERVER, 4000, 0, false}, //openssl s_server w/o client side auth
     { GNUTLS_SERVER, 5000, 1, false}, // gnutls-serv w/o client side auth
     { "www.mikestoolbox.org", 442, 2, false}, // mike's  w/o client side auth
     { OPENSSL_SERVER, 4000, 0, false}, //openssl s_server w/o client side auth
     { GNUTLS_SERVER, 5000, 1, false}, // gnutls-serv w/o client side auth
     { "www.mikestoolbox.org", 442, 2, false}, // mike's  w/o client side auth

-//    { "tls.secg.org", 40022, 3, false}, // secg ecc server w/o client side auth - This server generate DH params we dont support. 
+//    { "tls.secg.org", 40022, 3, false}, // secg ecc server w/o client side auth - This server generate DH params we dont support.

 
     { OPENSSL_SERVER, 4010, 0, true}, //openssl s_server w/ client side auth
     { GNUTLS_SERVER, 5010, 1, true}, // gnutls-serv w/ client side auth
 
     { OPENSSL_SERVER, 4010, 0, true}, //openssl s_server w/ client side auth
     { GNUTLS_SERVER, 5010, 1, true}, // gnutls-serv w/ client side auth

diff --git a/libsecurity_utilities/lib/macho++.h b/libsecurity_utilities/lib/macho++.h
index c1280b67f73a87db39c8a71fb457bf980c6a435f..54fb4abb3808e2e46ef5f9d502c3eee4b6c85369 100644 (file)
--- a/libsecurity_utilities/lib/macho++.h
+++ b/libsecurity_utilities/lib/macho++.h
@@ -202,6 +202,8 @@ public:
        bool isUniversal() const { return mArchList != NULL; }
        Architecture bestNativeArch() const;
        
        bool isUniversal() const { return mArchList != NULL; }
        Architecture bestNativeArch() const;
        

+       size_t offset() const { return mBase; }
+       

 public:
        static uint32_t typeOf(FileDesc fd);
 
 public:
        static uint32_t typeOf(FileDesc fd);
 

diff --git a/sec/SOSCircle/SecureObjectSync/SOSAccount.c b/sec/SOSCircle/SecureObjectSync/SOSAccount.c
index 8ac8431efb063057007aa527e226d1f5d57d2f05..198a3904e7b595ca6304a0db6b75f11efd852e84 100644 (file)
--- a/sec/SOSCircle/SecureObjectSync/SOSAccount.c
+++ b/sec/SOSCircle/SecureObjectSync/SOSAccount.c
@@ -1994,25 +1994,23 @@ static bool sosAccountLeaveCircle(SOSAccountRef account, SOSCircleRef circle, CF
     SOSFullPeerInfoRef fpi = SOSAccountGetMyFullPeerInCircle(account, circle, NULL);
     if(!fpi) return false;
        CFErrorRef localError = NULL;
     SOSFullPeerInfoRef fpi = SOSAccountGetMyFullPeerInCircle(account, circle, NULL);
     if(!fpi) return false;
        CFErrorRef localError = NULL;

-    SOSPeerInfoRef pi = SOSFullPeerInfoGetPeerInfo(fpi);
-       CFStringRef retire_key = SOSRetirementKeyCreateWithCircleAndPeer(circle, SOSPeerInfoGetPeerID(pi));
-       SOSPeerInfoRef retire_peer = NULL;
+       SOSPeerInfoRef retire_peer = SOSFullPeerInfoPromoteToRetiredAndCopy(fpi, &localError);;
+       CFStringRef retire_key = SOSRetirementKeyCreateWithCircleAndPeer(circle, SOSPeerInfoGetPeerID(retire_peer));

        CFDataRef retire_value = NULL;
     bool retval = false;
     bool writeCircle = false;
     
     // Create a Retirement Ticket and store it in the retired_peers of the account.
        CFDataRef retire_value = NULL;
     bool retval = false;
     bool writeCircle = false;
     
     // Create a Retirement Ticket and store it in the retired_peers of the account.

-       retire_peer = SOSFullPeerInfoPromoteToRetiredAndCopy(fpi, &localError);

     require_action_quiet(retire_peer, errout, secerror("Create ticket failed for peer %@: %@", fpi, localError));
        retire_value = SOSPeerInfoCopyEncodedData(retire_peer, NULL, &localError);
     require_action_quiet(retire_value, errout, secerror("Failed to encode retirement peer %@: %@", retire_peer, localError));
 
     // See if we need to repost the circle we could either be an applicant or a peer already in the circle
     require_action_quiet(retire_peer, errout, secerror("Create ticket failed for peer %@: %@", fpi, localError));
        retire_value = SOSPeerInfoCopyEncodedData(retire_peer, NULL, &localError);
     require_action_quiet(retire_value, errout, secerror("Failed to encode retirement peer %@: %@", retire_peer, localError));
 
     // See if we need to repost the circle we could either be an applicant or a peer already in the circle

-    if(SOSCircleHasApplicant(circle, pi, NULL)) {
+    if(SOSCircleHasApplicant(circle, retire_peer, NULL)) {

            // Remove our application if we have one.
            // Remove our application if we have one.

-           SOSCircleWithdrawRequest(circle, pi, NULL);
+           SOSCircleWithdrawRequest(circle, retire_peer, NULL);

         writeCircle = true;
         writeCircle = true;

-    } else if (SOSCircleHasPeer(circle, pi, NULL)) {
+    } else if (SOSCircleHasPeer(circle, retire_peer, NULL)) {

         if (SOSCircleUpdatePeerInfo(circle, retire_peer)) {
             CFErrorRef cleanupError = NULL;
             SOSAccountCleanupAfterPeer(account, RETIREMENT_FINALIZATION_SECONDS, circle, retire_peer, &cleanupError);
         if (SOSCircleUpdatePeerInfo(circle, retire_peer)) {
             CFErrorRef cleanupError = NULL;
             SOSAccountCleanupAfterPeer(account, RETIREMENT_FINALIZATION_SECONDS, circle, retire_peer, &cleanupError);

diff --git a/sec/SOSCircle/SecureObjectSync/SOSCircle.c b/sec/SOSCircle/SecureObjectSync/SOSCircle.c
index 9475fc64fe71d40f34eb5a6467f7d4566c9520a1..1b131fd40d66ad856d070cc8a20f48cb6272c8ca 100644 (file)
--- a/sec/SOSCircle/SecureObjectSync/SOSCircle.c
+++ b/sec/SOSCircle/SecureObjectSync/SOSCircle.c
@@ -279,6 +279,7 @@ static CFIndex CFArrayRemoveAllPassing(CFMutableArrayRef array, bool (^test)(con
 
 static CFIndex CFArrayRemoveAllWithMatchingID(CFMutableArrayRef array, SOSPeerInfoRef peerInfo) {
     CFStringRef peer_id = SOSPeerInfoGetPeerID(peerInfo);
 
 static CFIndex CFArrayRemoveAllWithMatchingID(CFMutableArrayRef array, SOSPeerInfoRef peerInfo) {
     CFStringRef peer_id = SOSPeerInfoGetPeerID(peerInfo);

+    if (!peer_id) return 0;

     
     return CFArrayRemoveAllPassing(array,  ^ bool (const void *element) {
         SOSPeerInfoRef peer = (SOSPeerInfoRef) element;
     
     return CFArrayRemoveAllPassing(array,  ^ bool (const void *element) {
         SOSPeerInfoRef peer = (SOSPeerInfoRef) element;

diff --git a/sec/SOSCircle/SecureObjectSync/SOSCoder.c b/sec/SOSCircle/SecureObjectSync/SOSCoder.c
index 581d1f2f765d94f3fcc31b498215bf8bfcfc1415..7a9eb8ff0754caa5b5f517816c842031c10e9e93 100644 (file)
--- a/sec/SOSCircle/SecureObjectSync/SOSCoder.c
+++ b/sec/SOSCircle/SecureObjectSync/SOSCoder.c
@@ -164,7 +164,7 @@ SOSCoderRef SOSCoderCreateFromData(CFDataRef exportedData, CFErrorRef *error) {
     require(ccder_decode_tag(&tag, der, der_end),fail);
 
     switch (tag) {
     require(ccder_decode_tag(&tag, der, der_end),fail);
 
     switch (tag) {

-        case CCDER_OCTET_STRING: 
+        case CCDER_OCTET_STRING:

         {
             der = der_decode_data(kCFAllocatorDefault, 0, &otr_data, error, der, der_end);
             p->waitingForDataPacket = false;
         {
             der = der_decode_data(kCFAllocatorDefault, 0, &otr_data, error, der, der_end);
             p->waitingForDataPacket = false;

diff --git a/sec/SOSCircle/SecureObjectSync/SOSPeerInfo.c b/sec/SOSCircle/SecureObjectSync/SOSPeerInfo.c
index 84c3e4812b11f3ff1ec97ee096d208b9daffaaa3..14738b2efbe232da98042dbb163df6a357a9de0b 100644 (file)
--- a/sec/SOSCircle/SecureObjectSync/SOSPeerInfo.c
+++ b/sec/SOSCircle/SecureObjectSync/SOSPeerInfo.c
@@ -365,8 +365,20 @@ static Boolean SOSPeerInfoCompare(CFTypeRef lhs, CFTypeRef rhs) {
 
 
 CFComparisonResult SOSPeerInfoCompareByID(const void *val1, const void *val2, void *context) {
 
 
 CFComparisonResult SOSPeerInfoCompareByID(const void *val1, const void *val2, void *context) {

+    // The code below is necessary but not sufficient; not returning a CFComparisonResult
+    // It probably is OK to say that a NULL is <  <non-NULL>
+    if (val1 == NULL || val2 == NULL) {
+           ptrdiff_t dv = val1 - val2;
+               return dv < 0 ? kCFCompareLessThan : dv == 0 ? kCFCompareEqualTo : kCFCompareGreaterThan;
+    }
+

        CFStringRef v1 = SOSPeerInfoGetPeerID((SOSPeerInfoRef) val1);
        CFStringRef v2 = SOSPeerInfoGetPeerID((SOSPeerInfoRef) val2);
        CFStringRef v1 = SOSPeerInfoGetPeerID((SOSPeerInfoRef) val1);
        CFStringRef v2 = SOSPeerInfoGetPeerID((SOSPeerInfoRef) val2);

+    if (v1 == NULL || v2 == NULL) {
+           ptrdiff_t dv = (const void *)v1 - (const void *)v2;
+        return dv < 0 ? kCFCompareLessThan : dv == 0 ? kCFCompareEqualTo : kCFCompareGreaterThan;
+    }
+

     return CFStringCompare(v1, v2, 0);
 }
 
     return CFStringCompare(v1, v2, 0);
 }
 


@@ -405,7 +417,7 @@ CFTypeRef SOSPeerInfoLookupGestaltValue(SOSPeerInfoRef pi, CFStringRef key) {
 }
 
 CFStringRef SOSPeerInfoGetPeerID(SOSPeerInfoRef pi) {
 }
 
 CFStringRef SOSPeerInfoGetPeerID(SOSPeerInfoRef pi) {

-    return pi->id;
+    return pi ? pi->id : NULL;

 }
 
 CFIndex SOSPeerInfoGetVersion(SOSPeerInfoRef pi) {
 }
 
 CFIndex SOSPeerInfoGetVersion(SOSPeerInfoRef pi) {

diff --git a/sec/Security/Regressions/secitem/si-33-keychain-backup.c b/sec/Security/Regressions/secitem/si-33-keychain-backup.c
index 0456964acd5013541413f4b3746cff472f047756..dddb3d10652d1c7270308f38d8dfc616287c16f7 100644 (file)
--- a/sec/Security/Regressions/secitem/si-33-keychain-backup.c
+++ b/sec/Security/Regressions/secitem/si-33-keychain-backup.c
@@ -409,7 +409,6 @@ static void tests(void)
               "Found the item we added after restore");
     CFReleaseNull(backup);
 
               "Found the item we added after restore");
     CFReleaseNull(backup);
 

-    // force tombstone to be added, since it's not the default behavior in Innsbruck per rdar://14680869

     CFDictionaryAddValue(query, kSecUseTombstones, kCFBooleanTrue);
 
     ok_status(SecItemDelete(query), "Deleted item we added");
     CFDictionaryAddValue(query, kSecUseTombstones, kCFBooleanTrue);
 
     ok_status(SecItemDelete(query), "Deleted item we added");

diff --git a/sec/sec.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/sec/sec.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644 (file)
index 2310a48..0000000
--- a/sec/sec.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:sec.xcodeproj">
-   </FileRef>
-</Workspace>

diff --git a/sec/sec.xcodeproj/project.xcworkspace/xcshareddata/sec.xccheckout b/sec/sec.xcodeproj/project.xcworkspace/xcshareddata/sec.xccheckout
deleted file mode 100644 (file)
index 3e2b35f..0000000
--- a/sec/sec.xcodeproj/project.xcworkspace/xcshareddata/sec.xccheckout
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IDESourceControlProjectFavoriteDictionaryKey</key>
-       <false/>
-       <key>IDESourceControlProjectIdentifier</key>
-       <string>55BE31B1-4B75-46C3-99C0-AC509F5CE8EA</string>
-       <key>IDESourceControlProjectName</key>
-       <string>sec</string>
-       <key>IDESourceControlProjectOriginsDictionary</key>
-       <dict>
-               <key>B1756FC7-4092-4712-B882-FDA75264D61A</key>
-               <string>git.apple.com:/git/projects/secmodules/sec</string>
-       </dict>
-       <key>IDESourceControlProjectPath</key>
-       <string>sec.xcodeproj/project.xcworkspace</string>
-       <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-       <dict>
-               <key>B1756FC7-4092-4712-B882-FDA75264D61A</key>
-               <string>../..</string>
-       </dict>
-       <key>IDESourceControlProjectURL</key>
-       <string>git.apple.com:/git/projects/secmodules/sec</string>
-       <key>IDESourceControlProjectVersion</key>
-       <integer>110</integer>
-       <key>IDESourceControlProjectWCCIdentifier</key>
-       <string>B1756FC7-4092-4712-B882-FDA75264D61A</string>
-       <key>IDESourceControlProjectWCConfigurations</key>
-       <array>
-               <dict>
-                       <key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-                       <string>public.vcs.git</string>
-                       <key>IDESourceControlWCCIdentifierKey</key>
-                       <string>B1756FC7-4092-4712-B882-FDA75264D61A</string>
-                       <key>IDESourceControlWCCName</key>
-                       <string>sec</string>
-               </dict>
-       </array>
-</dict>
-</plist>

diff --git a/sec/sec.xcodeproj/project.xcworkspace/xcuserdata/jkauth.xcuserdatad/UserInterfaceState.xcuserstate b/sec/sec.xcodeproj/project.xcworkspace/xcuserdata/jkauth.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644 (file)
index 9860dcc..0000000
Binary files a/sec/sec.xcodeproj/project.xcworkspace/xcuserdata/jkauth.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCPSRegresssions.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCPSRegresssions.xcscheme
deleted file mode 100644 (file)
index 6926d6a..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCPSRegresssions.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E7CBDB711890BD810010B75B"
-               BuildableName = "libCPSRegresssions.a"
-               BlueprintName = "libCPSRegresssions"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCloudKeychainProxy.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCloudKeychainProxy.xcscheme
deleted file mode 100644 (file)
index bac2687..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCloudKeychainProxy.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5284029F164445760035F320"
-               BuildableName = "libCloudKeychainProxy.a"
-               BlueprintName = "libCloudKeychainProxy"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCloudProtection.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCloudProtection.xcscheme
deleted file mode 100644 (file)
index 5880dcd..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libCloudProtection.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E7CBDB911890BF350010B75B"
-               BuildableName = "libCloudProtection.a"
-               BlueprintName = "libCloudProtection"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSOSCommands.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSOSCommands.xcscheme
deleted file mode 100644 (file)
index 2144bfe..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSOSCommands.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E7FEFB82169E363300E18152"
-               BuildableName = "libSOSCommands.a"
-               BlueprintName = "libSOSCommands"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSOSRegressions.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSOSRegressions.xcscheme
deleted file mode 100644 (file)
index 9e81d34..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSOSRegressions.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E702E75714E1F48800CDE635"
-               BuildableName = "libSOSRegressions.a"
-               BlueprintName = "libSOSRegressions"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecItemShimOSX.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecItemShimOSX.xcscheme
deleted file mode 100644 (file)
index f75e31b..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecItemShimOSX.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "186CDD0E14CA116C00AF9171"
-               BuildableName = "libSecItemShimOSX.a"
-               BlueprintName = "libSecItemShimOSX"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecOtrOSX.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecOtrOSX.xcscheme
deleted file mode 100644 (file)
index 95daee4..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecOtrOSX.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4A5CCA4E15ACEFA500702357"
-               BuildableName = "libSecOtrOSX.a"
-               BlueprintName = "libSecOtrOSX"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecureObjectSync.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecureObjectSync.xcscheme
deleted file mode 100644 (file)
index 91e9ff4..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecureObjectSync.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E702E73514E1F3EA00CDE635"
-               BuildableName = "libSecureObjectSync.a"
-               BlueprintName = "libSecureObjectSync"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityCommands.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityCommands.xcscheme
deleted file mode 100644 (file)
index 93eabc6..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityCommands.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E7104A12169E216E00DB0045"
-               BuildableName = "libSecurityCommands.a"
-               BlueprintName = "libSecurityCommands"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityRegressions.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityRegressions.xcscheme
deleted file mode 100644 (file)
index e5b07f2..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityRegressions.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4A824AFB158FF07000F932C0"
-               BuildableName = "libSecurityRegressions.a"
-               BlueprintName = "libSecurityRegressions"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityTool.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityTool.xcscheme
deleted file mode 100644 (file)
index 32f5412..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libSecurityTool.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E71049F1169E023B00DB0045"
-               BuildableName = "libSecurityTool.a"
-               BlueprintName = "libSecurityTool"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecdRegressions.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecdRegressions.xcscheme
deleted file mode 100644 (file)
index 27a28f0..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecdRegressions.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0C0BDB55175687EC00BC1A7E"
-               BuildableName = "libsecdRegressions.a"
-               BlueprintName = "libsecdRegressions"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecipc_client.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecipc_client.xcscheme
deleted file mode 100644 (file)
index c2be7ed..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecipc_client.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "18270F5414CF651900B05E7F"
-               BuildableName = "libsecipc_client.a"
-               BlueprintName = "libsecipc_client"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecurity.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecurity.xcscheme
deleted file mode 100644 (file)
index a165245..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecurity.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "18D4043414CE0CF300A2BE4E"
-               BuildableName = "libsecurity.a"
-               BlueprintName = "libsecurity"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecurityd.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecurityd.xcscheme
deleted file mode 100644 (file)
index 434f12e..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecurityd.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "18D4056114CE53C200A2BE4E"
-               BuildableName = "libsecurityd.a"
-               BlueprintName = "libsecurityd"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecuritydRegressions.xcscheme b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecuritydRegressions.xcscheme
deleted file mode 100644 (file)
index 904ed59..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/libsecuritydRegressions.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4CC92AC215A3BC6B00C6D578"
-               BuildableName = "libsecuritydRegressions.a"
-               BlueprintName = "libsecuritydRegressions"
-               ReferencedContainer = "container:sec.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/xcschememanagement.plist b/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644 (file)
index f24515b..0000000
--- a/sec/sec.xcodeproj/xcuserdata/jkauth.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>SchemeUserState</key>
-       <dict>
-               <key>libCPSRegresssions.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>15</integer>
-               </dict>
-               <key>libCloudKeychainProxy.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>9</integer>
-               </dict>
-               <key>libCloudProtection.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>14</integer>
-               </dict>
-               <key>libSOSCommands.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>12</integer>
-               </dict>
-               <key>libSOSRegressions.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>5</integer>
-               </dict>
-               <key>libSecItemShimOSX.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>2</integer>
-               </dict>
-               <key>libSecOtrOSX.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>8</integer>
-               </dict>
-               <key>libSecureObjectSync.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>4</integer>
-               </dict>
-               <key>libSecurityCommands.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>11</integer>
-               </dict>
-               <key>libSecurityRegressions.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>6</integer>
-               </dict>
-               <key>libSecurityTool.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>10</integer>
-               </dict>
-               <key>libsecdRegressions.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>13</integer>
-               </dict>
-               <key>libsecipc_client.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>3</integer>
-               </dict>
-               <key>libsecurity.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>0</integer>
-               </dict>
-               <key>libsecurityd.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>1</integer>
-               </dict>
-               <key>libsecuritydRegressions.xcscheme</key>
-               <dict>
-                       <key>orderHint</key>
-                       <integer>7</integer>
-               </dict>
-       </dict>
-       <key>SuppressBuildableAutocreation</key>
-       <dict>
-               <key>0C0BDB55175687EC00BC1A7E</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>18270F5414CF651900B05E7F</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>186CDD0E14CA116C00AF9171</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>18D4043414CE0CF300A2BE4E</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>18D4056114CE53C200A2BE4E</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>4A5CCA4E15ACEFA500702357</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>4A824AFB158FF07000F932C0</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>4CC92AC215A3BC6B00C6D578</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>5284029F164445760035F320</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>E702E73514E1F3EA00CDE635</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>E702E75714E1F48800CDE635</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>E71049F1169E023B00DB0045</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>E7104A12169E216E00DB0045</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>E7CBDB711890BD810010B75B</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>E7CBDB911890BF350010B75B</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-               <key>E7FEFB82169E363300E18152</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
-       </dict>
-</dict>
-</plist>