securityd-32597.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/securityd.xcode/project.pbxproj b/securityd.xcode/project.pbxproj
index 0b3150ff12b3c9ca08993cdca284c45217af1095..52f503b4307abe330eef1c552d625d9fc79520dd 100644 (file)
--- a/securityd.xcode/project.pbxproj
+++ b/securityd.xcode/project.pbxproj
@@ -839,18 +839,18 @@
                                CURRENT_PROJECT_VERSION = 1;
                                FRAMEWORK_SEARCH_PATHS = "/usr/local/SecurityPieces/Frameworks /usr/local/SecurityPieces/Components/securityd $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                INSTALL_PATH = /usr/sbin;
                                CURRENT_PROJECT_VERSION = 1;
                                FRAMEWORK_SEARCH_PATHS = "/usr/local/SecurityPieces/Frameworks /usr/local/SecurityPieces/Components/securityd $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                INSTALL_PATH = /usr/sbin;

-                               OPT_CPPXFLAGS = "$(OPT_CXFLAGS) -fno-enforce-eh-specs -fno-implement-inlines -fcoalesce-templates";
+                               OPT_CPPXFLAGS = "$(OPT_CXFLAGS)";

                                OPT_CXFLAGS = "-DNDEBUG $(OPT_INLINEXFLAGS)";
                                OPT_CXFLAGS = "-DNDEBUG $(OPT_INLINEXFLAGS)";

-                               OPT_INLINEXFLAGS = " -finline-functions --param max-inline-insns-single=150 --param max-inline-insns-auto=150 --param max-inline-insns=300 --param min-inline-insns=90";
+                               OPT_INLINEXFLAGS = "-finline-functions";

                                OPT_LDXFLAGS = "-dead_strip";
                                OPT_LDXNOPIC = ",_nopic";
                                OTHER_ASFLAGS_debug = "$(OTHER_CFLAGS)";
                                OTHER_ASFLAGS_normal = "-DNDEBUG $(OTHER_CFLAGS)";
                                OTHER_ASFLAGS_profile = "-DNDEBUG $(OTHER_CFLAGS) -pg";
                                OPT_LDXFLAGS = "-dead_strip";
                                OPT_LDXNOPIC = ",_nopic";
                                OTHER_ASFLAGS_debug = "$(OTHER_CFLAGS)";
                                OTHER_ASFLAGS_normal = "-DNDEBUG $(OTHER_CFLAGS)";
                                OTHER_ASFLAGS_profile = "-DNDEBUG $(OTHER_CFLAGS) -pg";

-                               OTHER_CFLAGS_debug = "$(OTHER_CFLAGS) -O0 -fno-inline";
+                               OTHER_CFLAGS_debug = "$(OTHER_CFLAGS) -O1 -fno-inline";

                                OTHER_CFLAGS_normal = "$(OPT_CXFLAGS) $(OTHER_CFLAGS)";
                                OTHER_CFLAGS_profile = "$(OPT_CXFLAGS) $(OTHER_CFLAGS) -pg";
                                OTHER_CFLAGS_normal = "$(OPT_CXFLAGS) $(OTHER_CFLAGS)";
                                OTHER_CFLAGS_profile = "$(OPT_CXFLAGS) $(OTHER_CFLAGS) -pg";

-                               OTHER_CPLUSPLUSFLAGS_debug = "$(OTHER_CPLUSPLUSFLAGS) -O0 -fno-inline";
+                               OTHER_CPLUSPLUSFLAGS_debug = "$(OTHER_CPLUSPLUSFLAGS) -O1 -fno-inline";

                                OTHER_CPLUSPLUSFLAGS_normal = "$(OPT_CPPXFLAGS) $(OTHER_CPLUSPLUSFLAGS)";
                                OTHER_CPLUSPLUSFLAGS_profile = "$(OPT_CPPXFLAGS) $(OTHER_CPLUSPLUSFLAGS) -pg";
                                OTHER_LDFLAGS = "-lbsm";
                                OTHER_CPLUSPLUSFLAGS_normal = "$(OPT_CPPXFLAGS) $(OTHER_CPLUSPLUSFLAGS)";
                                OTHER_CPLUSPLUSFLAGS_profile = "$(OPT_CPPXFLAGS) $(OTHER_CPLUSPLUSFLAGS) -pg";
                                OTHER_LDFLAGS = "-lbsm";


@@ -1378,8 +1378,8 @@
                                OPT_LDFLAGS = "";
                                OPT_LDXFLAGS = "";
                                OPT_LDXNOPIC = "";
                                OPT_LDFLAGS = "";
                                OPT_LDXFLAGS = "";
                                OPT_LDXNOPIC = "";

-                               OTHER_CFLAGS_normal = "$(OTHER_CFLAGS) -O0 -fno-inline";
-                               OTHER_CPLUSPLUSFLAGS_normal = "$(OTHER_CPLUSPLUSFLAGS) -O0 -fno-inline";
+                               OTHER_CFLAGS_normal = "$(OTHER_CFLAGS) -O1 -fno-inline";
+                               OTHER_CPLUSPLUSFLAGS_normal = "$(OTHER_CPLUSPLUSFLAGS) -O1 -fno-inline";

                        };
                        isa = PBXBuildStyle;
                        name = "normal with debug";
                        };
                        isa = PBXBuildStyle;
                        name = "normal with debug";

diff --git a/src/acls.cpp b/src/acls.cpp
index f820d00aca1d93cd7870b3497cc2b92185557c2a..aa2524a21ac71e91e597864bd4acaa07c6c44dd1 100644 (file)
--- a/src/acls.cpp
+++ b/src/acls.cpp
@@ -187,6 +187,9 @@ ObjectAcl *SecurityServerEnvironment::preAuthSource()
 //
 // The default AclSource denies having an ACL at all
 //
 //
 // The default AclSource denies having an ACL at all
 //

+AclSource::~AclSource()
+{ /* virtual */ }
+

 SecurityServerAcl &AclSource::acl()
 {
        CssmError::throwMe(CSSM_ERRCODE_OBJECT_ACL_NOT_SUPPORTED);
 SecurityServerAcl &AclSource::acl()
 {
        CssmError::throwMe(CSSM_ERRCODE_OBJECT_ACL_NOT_SUPPORTED);

diff --git a/src/acls.h b/src/acls.h
index 0aad47f6d36e453d108c4df0d4841dc9f4b5bea5..ed8338b9acc6f973b56f2573b4d7cf38a1c76fd3 100644 (file)
--- a/src/acls.h
+++ b/src/acls.h
@@ -118,6 +118,7 @@ public:
 class AclSource {
 protected:
        AclSource() { }
 class AclSource {
 protected:
        AclSource() { }

+       virtual ~AclSource();

        
 public:
        virtual SecurityServerAcl &acl();       // defaults to "no ACL; throw exception"
        
 public:
        virtual SecurityServerAcl &acl();       // defaults to "no ACL; throw exception"

diff --git a/src/agentquery.cpp b/src/agentquery.cpp
index 1876642b44ca09f84393bd500696ca22606e7893..9878249a3acd2d5567c6146482dd9fbee84a17fb 100644 (file)
--- a/src/agentquery.cpp
+++ b/src/agentquery.cpp
@@ -242,7 +242,7 @@ Reason QueryKeychainUse::queryUser (const char *database, const char *descriptio
        
        if (mPassphraseCheck)
        {
        
        if (mPassphraseCheck)
        {

-               create("builtin", "confirm-access-password", NULL);
+               create("builtin", "confirm-access-password", noSecuritySession);

                
                CssmAutoData data(Allocator::standard(Allocator::sensitive));
 
                
                CssmAutoData data(Allocator::standard(Allocator::sensitive));
 


@@ -280,7 +280,7 @@ Reason QueryKeychainUse::queryUser (const char *database, const char *descriptio
        }
        else
        {
        }
        else
        {

-               create("builtin", "confirm-access", NULL);
+               create("builtin", "confirm-access", noSecuritySession);

         setInput(hints, context);
                invoke();
        }
         setInput(hints, context);
                invoke();
        }


@@ -322,7 +322,7 @@ bool QueryCodeCheck::operator () (const char *aclPath)
        
        hints.insert(AuthItemRef(AGENT_HINT_APPLICATION_PATH, AuthValueOverlay(strlen(aclPath), const_cast<char*>(aclPath))));
        
        
        hints.insert(AuthItemRef(AGENT_HINT_APPLICATION_PATH, AuthValueOverlay(strlen(aclPath), const_cast<char*>(aclPath))));
        

-       create("builtin", "code-identity", NULL);
+       create("builtin", "code-identity", noSecuritySession);

 
     setInput(hints, context);
        status = invoke();
 
     setInput(hints, context);
        status = invoke();


@@ -366,7 +366,7 @@ Reason QueryOld::query()
 
        hints.insert(mClientHints.begin(), mClientHints.end());
 
 
        hints.insert(mClientHints.begin(), mClientHints.end());
 

-       create("builtin", "unlock-keychain", NULL);
+       create("builtin", "unlock-keychain", noSecuritySession);

 
        do
        {
 
        do
        {


@@ -478,10 +478,10 @@ Reason QueryNewPassphrase::query()
     switch (initialReason)
     {
         case SecurityAgent::newDatabase: 
     switch (initialReason)
     {
         case SecurityAgent::newDatabase: 

-            create("builtin", "new-passphrase", NULL);
+            create("builtin", "new-passphrase", noSecuritySession);

             break;
         case SecurityAgent::changePassphrase:
             break;
         case SecurityAgent::changePassphrase:

-            create("builtin", "change-passphrase", NULL);
+            create("builtin", "change-passphrase", noSecuritySession);

             break;
         default:
             assert(false);
             break;
         default:
             assert(false);


@@ -597,11 +597,11 @@ Reason QueryGenericPassphrase::query(const char *prompt, bool verify,
     // CSSM_ATTRIBUTE_ALERT_TITLE (optional alert panel title)
        
     if (false == verify) {  // import
     // CSSM_ATTRIBUTE_ALERT_TITLE (optional alert panel title)
        
     if (false == verify) {  // import

-               create("builtin", "generic-unlock", NULL);
+               create("builtin", "generic-unlock", noSecuritySession);

     } else {           // verify passphrase (export)
                                        // new-passphrase-generic works with the pre-4 June 2004 agent; 
                                        // generic-new-passphrase is required for the new agent
     } else {           // verify passphrase (export)
                                        // new-passphrase-generic works with the pre-4 June 2004 agent; 
                                        // generic-new-passphrase is required for the new agent

-               create("builtin", "generic-new-passphrase", NULL);
+               create("builtin", "generic-new-passphrase", noSecuritySession);

     }
     
     AuthItem *passwordItem;
     }
     
     AuthItem *passwordItem;


@@ -652,7 +652,7 @@ Reason QueryDBBlobSecret::query(DatabaseCryptoCore &dbCore, const DbBlob *secret
        
     hints.insert(mClientHints.begin(), mClientHints.end());
        
        
     hints.insert(mClientHints.begin(), mClientHints.end());
        

-       create("builtin", "generic-unlock-kcblob", NULL);
+       create("builtin", "generic-unlock-kcblob", noSecuritySession);

     
     AuthItem *secretItem;
     
     
     AuthItem *secretItem;
     

diff --git a/src/codesigdb.cpp b/src/codesigdb.cpp
index d8094fa3d89dacf19bca228edc53aaab2c905ea0..4ff3d6490680958d5ccbbe6150c22110301d403a 100644 (file)
--- a/src/codesigdb.cpp
+++ b/src/codesigdb.cpp
@@ -116,7 +116,8 @@ CodeSignatures::~CodeSignatures()
 void CodeSignatures::open(const char *path)
 {
        mDb.open(path, O_RDWR | O_CREAT, 0644);
 void CodeSignatures::open(const char *path)
 {
        mDb.open(path, O_RDWR | O_CREAT, 0644);

-       mDb.flush();
+       if (mDb)
+               mDb.flush();

        IFDUMPING("equiv", debugDump("reopen"));
 }
 
        IFDUMPING("equiv", debugDump("reopen"));
 }
 


@@ -144,6 +145,8 @@ string CodeSignatures::Identity::canonicalName(const string &path)
 //
 bool CodeSignatures::find(Identity &id, uid_t user)
 {
 //
 bool CodeSignatures::find(Identity &id, uid_t user)
 {

+       if (!mDb)
+               return false;

        if (id.mState != Identity::untried)
                return id.mState == Identity::valid;
        try {
        if (id.mState != Identity::untried)
                return id.mState == Identity::valid;
        try {


@@ -171,6 +174,8 @@ bool CodeSignatures::find(Identity &id, uid_t user)
 
 void CodeSignatures::makeLink(Identity &id, const string &ident, bool forUser, uid_t user)
 {
 
 void CodeSignatures::makeLink(Identity &id, const string &ident, bool forUser, uid_t user)
 {

+       if (!mDb)
+               UnixError::throwMe(ENOENT);

        DbKey key('H', id.getHash(mSigner), forUser, user);
        if (!mDb.put(key, StringData(ident)))
                UnixError::throwMe();
        DbKey key('H', id.getHash(mSigner), forUser, user);
        if (!mDb.put(key, StringData(ident)))
                UnixError::throwMe();


@@ -214,6 +219,8 @@ void CodeSignatures::addLink(const CssmData &oldHash, const CssmData &newHash,
 
 void CodeSignatures::removeLink(const CssmData &hash, const char *name, bool forSystem)
 {
 
 void CodeSignatures::removeLink(const CssmData &hash, const char *name, bool forSystem)
 {

+       if (!mDb)
+               UnixError::throwMe(ENOENT);

        AclIdentity code(hash, name);
        uid_t user = Server::process().uid();
        if (forSystem && user)  // only root user can remove forSystem links
        AclIdentity code(hash, name);
        uid_t user = Server::process().uid();
        if (forSystem && user)  // only root user can remove forSystem links


@@ -252,6 +259,12 @@ bool CodeSignatures::verify(Process &process,
                return false;
        }
        
                return false;
        }
        

+       // don't bother the user if the db is MIA
+       if (!mDb) {
+               secdebug("codesign", "database not open; cannot verify");
+               return false;
+       }
+       

        // ah well. Establish mediator objects for database signature links
        AclIdentity aclIdentity(trustedSignature, comment ? comment->interpretedAs<const char>() : NULL);
 
        // ah well. Establish mediator objects for database signature links
        AclIdentity aclIdentity(trustedSignature, comment ? comment->interpretedAs<const char>() : NULL);
 


@@ -302,7 +315,7 @@ bool CodeSignatures::verify(Process &process,
                        return false;
                }
        }
                        return false;
                }
        }

-       
+

        // ask the user
        QueryCodeCheck query;
     query.inferHints(process);
        // ask the user
        QueryCodeCheck query;
     query.inferHints(process);


@@ -357,20 +370,24 @@ void CodeSignatures::debugDump(const char *how) const
        if (!how)
                how = "dump";
        CssmData key, value;
        if (!how)
                how = "dump";
        CssmData key, value;

-       if (!mDb.first(key, value)) {
-               dump("CODE EQUIVALENTS DATABASE IS EMPTY (%s)\n", how);
+       if (!mDb) {
+               dump("CODE EQUIVALENTS DATABASE IS NOT OPEN (%s)", how);

        } else {
        } else {

-               dump("CODE EQUIVALENTS DATABASE DUMP (%s)\n", how);
-               do {
-                       const char *header = key.interpretedAs<const char>();
-                       size_t headerLength = strlen(header) + 1;
-                       dump("%s:", header);
-                       dumpData(key.at(headerLength), key.length() - headerLength);
-                       dump(" => ");
-                       dumpData(value);
-                       dump("\n");
-               } while (mDb.next(key, value));
-               dump("END DUMP\n");
+               if (!mDb.first(key, value)) {
+                       dump("CODE EQUIVALENTS DATABASE IS EMPTY (%s)\n", how);
+               } else {
+                       dump("CODE EQUIVALENTS DATABASE DUMP (%s)\n", how);
+                       do {
+                               const char *header = key.interpretedAs<const char>();
+                               size_t headerLength = strlen(header) + 1;
+                               dump("%s:", header);
+                               dumpData(key.at(headerLength), key.length() - headerLength);
+                               dump(" => ");
+                               dumpData(value);
+                               dump("\n");
+                       } while (mDb.next(key, value));
+                       dump("END DUMP\n");
+               }

        }
 }
 
        }
 }
 

diff --git a/src/dbcrypto.cpp b/src/dbcrypto.cpp
index b8506535da0dde1d6ae0a8f52f26bc3b32e27310..5054f85d1d6f71605795223fdda52c108599f1ac 100644 (file)
--- a/src/dbcrypto.cpp
+++ b/src/dbcrypto.cpp
@@ -238,7 +238,7 @@ DbBlob *DatabaseCryptoCore::encodeCore(const DbBlob &blobTemplate,
 // Throws exceptions if decoding fails.
 // Memory returned in privateAclBlob is allocated and becomes owned by caller.
 //
 // Throws exceptions if decoding fails.
 // Memory returned in privateAclBlob is allocated and becomes owned by caller.
 //

-void DatabaseCryptoCore::decodeCore(DbBlob *blob, void **privateAclBlob)
+void DatabaseCryptoCore::decodeCore(const DbBlob *blob, void **privateAclBlob)

 {
        assert(mHaveMaster);    // must have master key installed
     
 {
        assert(mHaveMaster);    // must have master key installed
     


@@ -247,8 +247,8 @@ void DatabaseCryptoCore::decodeCore(DbBlob *blob, void **privateAclBlob)
     decryptor.mode(CSSM_ALGMODE_CBCPadIV8);
     decryptor.padding(CSSM_PADDING_PKCS1);
     decryptor.key(mMasterKey);
     decryptor.mode(CSSM_ALGMODE_CBCPadIV8);
     decryptor.padding(CSSM_PADDING_PKCS1);
     decryptor.key(mMasterKey);

-    CssmData ivd(blob->iv, sizeof(blob->iv)); decryptor.initVector(ivd);
-    CssmData cryptoBlob(blob->cryptoBlob(), blob->cryptoBlobLength());
+    CssmData ivd = CssmData::wrap(blob->iv); decryptor.initVector(ivd);
+    CssmData cryptoBlob = CssmData::wrap(blob->cryptoBlob(), blob->cryptoBlobLength());

     CssmData decryptedBlob, remData;
     decryptor.decrypt(cryptoBlob, decryptedBlob, remData);
     DbBlob::PrivateBlob *privateBlob = decryptedBlob.interpretedAs<DbBlob::PrivateBlob>();
     CssmData decryptedBlob, remData;
     decryptor.decrypt(cryptoBlob, decryptedBlob, remData);
     DbBlob::PrivateBlob *privateBlob = decryptedBlob.interpretedAs<DbBlob::PrivateBlob>();


@@ -263,8 +263,8 @@ void DatabaseCryptoCore::decodeCore(DbBlob *blob, void **privateAclBlob)
     
     // verify signature on the whole blob
     CssmData signChunk[] = {
     
     // verify signature on the whole blob
     CssmData signChunk[] = {

-               CssmData(blob->data(), fieldOffsetOf(&DbBlob::blobSignature)),
-       CssmData(blob->publicAclBlob(), blob->publicAclBlobLength() + blob->cryptoBlobLength())
+               CssmData::wrap(blob->data(), fieldOffsetOf(&DbBlob::blobSignature)),
+       CssmData::wrap(blob->publicAclBlob(), blob->publicAclBlobLength() + blob->cryptoBlobLength())

        };
     CSSM_ALGORITHMS verifyAlgorithm = CSSM_ALGID_SHA1HMAC;
 #if defined(COMPAT_OSX_10_0)
        };
     CSSM_ALGORITHMS verifyAlgorithm = CSSM_ALGID_SHA1HMAC;
 #if defined(COMPAT_OSX_10_0)


@@ -273,7 +273,7 @@ void DatabaseCryptoCore::decodeCore(DbBlob *blob, void **privateAclBlob)
 #endif
     VerifyMac verifier(Server::csp(), verifyAlgorithm);
     verifier.key(mSigningKey);
 #endif
     VerifyMac verifier(Server::csp(), verifyAlgorithm);
     verifier.key(mSigningKey);

-    verifier.verify(signChunk, 2, CssmData(blob->blobSignature, sizeof(blob->blobSignature)));
+    verifier.verify(signChunk, 2, CssmData::wrap(blob->blobSignature));

     
     // all checks out; start extracting fields
     if (privateAclBlob) {
     
     // all checks out; start extracting fields
     if (privateAclBlob) {

diff --git a/src/dbcrypto.h b/src/dbcrypto.h
index 3067b70e0f81768da28ce8329bfc4bddd5203b47..16d42e3f00cd6798dc16af39b348f2e8f4628377 100644 (file)
--- a/src/dbcrypto.h
+++ b/src/dbcrypto.h
@@ -55,7 +55,7 @@ public:
        void setup(const DbBlob *blob, const CssmData &passphrase);
        void setup(const DbBlob *blob, CssmClient::Key master);
 
        void setup(const DbBlob *blob, const CssmData &passphrase);
        void setup(const DbBlob *blob, CssmClient::Key master);
 

-    void decodeCore(DbBlob *blob, void **privateAclBlob = NULL);
+    void decodeCore(const DbBlob *blob, void **privateAclBlob = NULL);

     DbBlob *encodeCore(const DbBlob &blobTemplate,
         const CssmData &publicAcl, const CssmData &privateAcl) const;
        void importSecrets(const DatabaseCryptoCore &src);
     DbBlob *encodeCore(const DbBlob &blobTemplate,
         const CssmData &publicAcl, const CssmData &privateAcl) const;
        void importSecrets(const DatabaseCryptoCore &src);

diff --git a/src/flippers.cpp b/src/flippers.cpp
index 6f6741598aaee16dbbeee4ed5f504abd864f8cde..4f8fa31885b8cdad7741634832d76eda1fd24bd8 100644 (file)
--- a/src/flippers.cpp
+++ b/src/flippers.cpp
@@ -33,13 +33,6 @@ using namespace LowLevelMemoryUtilities;
 
 namespace Flippers {
 
 
 namespace Flippers {
 

-
-//
-// Automatically generated flippers
-//
-#include "flip_gen.cpp"
-
-

 //
 // The raw byte reversal flipper
 //
 //
 // The raw byte reversal flipper
 //


@@ -82,4 +75,41 @@ void flip(CSSM_CONTEXT_ATTRIBUTE &obj)
 }
 
 
 }
 
 

+//
+// Flip a CSSM_DB_ATTRIBUTE_INFO, also very polymorphic
+//
+void flip(CSSM_DB_ATTRIBUTE_INFO &obj)
+{
+       bool flippedAttributeNameFormat = false;
+       // check and see if obj is in host byte order.  If not, flip it now
+       if (obj.AttributeNameFormat > CSSM_DB_ATTRIBUTE_NAME_AS_INTEGER)
+       {
+               flip(obj.AttributeNameFormat);
+               flippedAttributeNameFormat = true;
+       }
+
+       switch (obj.AttributeNameFormat)
+       {
+               case CSSM_DB_ATTRIBUTE_NAME_AS_INTEGER:
+               {
+                       flip(obj.Label.AttributeID);
+               }
+               break;
+       }
+       
+       flip (obj.AttributeFormat);
+
+       if (!flippedAttributeNameFormat)
+       {
+               flip(obj.AttributeNameFormat);
+       }
+       
+}
+
+//
+// Automatically generated flippers
+//
+#include "flip_gen.cpp"
+
+

 }      // end namespace Flippers
 }      // end namespace Flippers

diff --git a/src/flippers.h b/src/flippers.h
index 6e437c0035caa8b69078cf26ffb8380c6fa0efda..9d2fb8c0c3729b1e33ea921da2131de3e6fd8c86 100644 (file)
--- a/src/flippers.h
+++ b/src/flippers.h
@@ -56,8 +56,7 @@ inline void flip(T &obj)
 // It's a bad idea to try to flip a const, so flag that
 //
 template <class T>
 // It's a bad idea to try to flip a const, so flag that
 //
 template <class T>

-inline void flip(const T &)
-{ tryingToFlipAConstWontWork(); }
+inline void flip(const T &);

 
 
 //
 
 
 //


@@ -77,6 +76,8 @@ inline void flip(Base * &obj)                 { flip(&obj, sizeof(obj)); }
 //
 void flip(void *addr, size_t size);
 
 //
 void flip(void *addr, size_t size);
 

+void flip(CSSM_DB_ATTRIBUTE_INFO &obj);
+inline void flip(CssmDbAttributeInfo &obj) { flip(static_cast<CSSM_DB_ATTRIBUTE_INFO &>(obj)); }

 
 //
 // Include automatically generated flipper declarations
 
 //
 // Include automatically generated flipper declarations

diff --git a/src/generate.cf b/src/generate.cf
index 8557c3ef5c0ca941b805f3e969a32db39b6bbd2a..fa387c5fd9b1e5907e8fe5c9104a06d75eac04c9 100644 (file)
--- a/src/generate.cf
+++ b/src/generate.cf
@@ -33,7 +33,9 @@ CSSM_RANGE *
 CSSM_KEY_SIZE/CssmKeySize *
 CSSM_KEYHEADER/CssmKey::Header *
 CSSM_KEY/CssmKey       KeyHeader
 CSSM_KEY_SIZE/CssmKeySize *
 CSSM_KEYHEADER/CssmKey::Header *
 CSSM_KEY/CssmKey       KeyHeader

-
+CSSM_QUERY/CssmQuery RecordType Conjunctive NumSelectionPredicates QueryLimits QueryFlags
+CSSM_DB_ATTRIBUTE_DATA/CssmDbAttributeData NumberOfValues
+CSSM_DB_RECORD_ATTRIBUTE_DATA/CssmDbRecordAttributeData DataRecordType SemanticInformation NumberOfAttributes

 
 #
 # Authorization structures
 
 #
 # Authorization structures

diff --git a/src/kcdatabase.cpp b/src/kcdatabase.cpp
index 8f723c5609e72c415dd913f7460c0c6629fcfe74..32160b54869062b69b567bc2265085e30de8176d 100644 (file)
--- a/src/kcdatabase.cpp
+++ b/src/kcdatabase.cpp
@@ -878,10 +878,10 @@ void KeychainDatabase::validateBlob(const DbBlob *blob)
        blob->validate(CSSMERR_APPLEDL_INVALID_DATABASE_BLOB);
        switch (blob->version()) {
 #if defined(COMPAT_OSX_10_0)
        blob->validate(CSSMERR_APPLEDL_INVALID_DATABASE_BLOB);
        switch (blob->version()) {
 #if defined(COMPAT_OSX_10_0)

-               case blob->version_MacOS_10_0:
+               case DbBlob::version_MacOS_10_0:

                        break;
 #endif
                        break;
 #endif

-               case blob->version_MacOS_10_1:
+               case DbBlob::version_MacOS_10_1:

                        break;
                default:
                        CssmError::throwMe(CSSMERR_APPLEDL_INCOMPATIBLE_DATABASE_BLOB);
                        break;
                default:
                        CssmError::throwMe(CSSMERR_APPLEDL_INCOMPATIBLE_DATABASE_BLOB);

diff --git a/src/kckey.cpp b/src/kckey.cpp
index c5c825eba9f498c9f9ef7a6fe918532d2a3a8f06..f6ed602e7936b8bc80941f37faf6c3d80901555c 100644 (file)
--- a/src/kckey.cpp
+++ b/src/kckey.cpp
@@ -43,10 +43,10 @@ KeychainKey::KeychainKey(Database &db, const KeyBlob *blob)
     blob->validate(CSSMERR_APPLEDL_INVALID_KEY_BLOB);
     switch (blob->version()) {
 #if defined(COMPAT_OSX_10_0)
     blob->validate(CSSMERR_APPLEDL_INVALID_KEY_BLOB);
     switch (blob->version()) {
 #if defined(COMPAT_OSX_10_0)

-    case blob->version_MacOS_10_0:
+    case KeyBlob::version_MacOS_10_0:

         break;
 #endif
         break;
 #endif

-    case blob->version_MacOS_10_1:
+    case KeyBlob::version_MacOS_10_1:

         break;
     default:
         CssmError::throwMe(CSSMERR_APPLEDL_INCOMPATIBLE_KEY_BLOB);
         break;
     default:
         CssmError::throwMe(CSSMERR_APPLEDL_INCOMPATIBLE_KEY_BLOB);

diff --git a/src/main.cpp b/src/main.cpp
index 2208882c4b92a2d5d7d8c7808b50057b78ca7139..5b47f5ee3566f096fade24e7793b7d9e909fa88e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,7 +64,6 @@
 #include <security_cdsa_utilities/acl_preauth.h>
 #include "acl_keychain.h"
 
 #include <security_cdsa_utilities/acl_preauth.h>
 #include "acl_keychain.h"
 

-

 //
 // Local functions of the main program driver
 //
 //
 // Local functions of the main program driver
 //


@@ -261,7 +260,7 @@ int main(int argc, char *argv[])
     
     // install MDS and initialize the local CSSM
     server.loadCssm();
     
     // install MDS and initialize the local CSSM
     server.loadCssm();

-    
+

        // okay, we're ready to roll
        Syslog::notice("Entering service");
        secdebug("SS", "%s initialized", bootstrapName);
        // okay, we're ready to roll
        Syslog::notice("Entering service");
        secdebug("SS", "%s initialized", bootstrapName);

diff --git a/src/notifications.cpp b/src/notifications.cpp
index 0ac6a36fb6d87f0e1a18070b9c72d3ea6bd9ab6f..ebee947e35423b3cac0f528b8c7f27fe467359eb 100644 (file)
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -29,7 +29,6 @@
 #include "server.h"
 #include <securityd_client/ucspNotify.h>
 
 #include "server.h"
 #include <securityd_client/ucspNotify.h>
 

-

 Listener::ListenerMap Listener::listeners;
 Mutex Listener::setLock;
 
 Listener::ListenerMap Listener::listeners;
 Mutex Listener::setLock;
 


@@ -116,7 +115,7 @@ void ProcessListener::notifyMe(NotificationDomain domain,
 {
     secdebug("notify", "%p sending domain %ld event 0x%lx to port %d process %d",
         this, domain, event, mPort.port(), process.pid());
 {
     secdebug("notify", "%p sending domain %ld event 0x%lx to port %d process %d",
         this, domain, event, mPort.port(), process.pid());

-    
+

     // send mach message (via MIG simpleroutine)
     if (IFDEBUG(kern_return_t rc =) ucsp_notify_sender_notify(mPort,
         domain, event, data.data(), data.length(),
     // send mach message (via MIG simpleroutine)
     if (IFDEBUG(kern_return_t rc =) ucsp_notify_sender_notify(mPort,
         domain, event, data.data(), data.length(),

diff --git a/src/server.h b/src/server.h
index 80c099281428bed2ca6f1d68cb91944b6d28924c..011a649fc95a6dfa1d16a0bd1182b93cc083f812 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -114,11 +114,11 @@ public:
        static AclSource &aclBearer(AclKind kind, CSSM_HANDLE handle);
        
        // Generic version of handle lookup
        static AclSource &aclBearer(AclKind kind, CSSM_HANDLE handle);
        
        // Generic version of handle lookup

-       template <class Type>
-       static RefPointer<Type> find(CSSM_HANDLE handle, CSSM_RETURN notFoundError)
+       template <class ProcessBearer>
+       static RefPointer<ProcessBearer> find(CSSM_HANDLE handle, CSSM_RETURN notFoundError)

        {
        {

-               RefPointer<Type> object = 
-                       HandleObject::findRef<Type>(handle, notFoundError);
+               RefPointer<ProcessBearer> object = 
+                       HandleObject::findRef<ProcessBearer>(handle, notFoundError);

                if (object->process() != Server::process())
                        CssmError::throwMe(notFoundError);
                return object;
                if (object->process() != Server::process())
                        CssmError::throwMe(notFoundError);
                return object;

diff --git a/src/session.cpp b/src/session.cpp
index 9f4854fcb85e2e436bf89d7decb5a65dd41fe52d..7cabc913cbebd61d89e124dfc85a26e759b2d0d3 100644 (file)
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -485,7 +485,7 @@ OSStatus Session::authorizationdbRemove(const AuthorizationBlob &authBlob, Autho
 void Session::mergeCredentials(CredentialSet &creds)
 {
     secdebug("SSsession", "%p merge creds @%p", this, &creds);
 void Session::mergeCredentials(CredentialSet &creds)
 {
     secdebug("SSsession", "%p merge creds @%p", this, &creds);

-    CredentialSet updatedCredentials = creds;
+       CredentialSet updatedCredentials = creds;

        for (CredentialSet::const_iterator it = creds.begin(); it != creds.end(); it++)
                if (((*it)->isShared() && (*it)->isValid())) {
                        CredentialSet::iterator old = mSessionCreds.find(*it);
        for (CredentialSet::const_iterator it = creds.begin(); it != creds.end(); it++)
                if (((*it)->isShared() && (*it)->isValid())) {
                        CredentialSet::iterator old = mSessionCreds.find(*it);


@@ -498,7 +498,7 @@ void Session::mergeCredentials(CredentialSet &creds)
                 updatedCredentials.insert(*old);
             }
                }
                 updatedCredentials.insert(*old);
             }
                }

-    creds.swap(updatedCredentials);
+       creds.swap(updatedCredentials);

 }
 
 
 }
 
 

diff --git a/src/session.h b/src/session.h
index b252964e8ffddfef2592facab6bf92e863904cdf..7799cc4dc028f4cf6a45e3ec113c35c5e4f751ab 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -139,7 +139,7 @@ protected:
        
        void kill();
        
        
        void kill();
        

-private:
+protected:

        static PortMap<Session> mSessions;
 };
 
        static PortMap<Session> mSessions;
 };
 

diff --git a/src/structure.h b/src/structure.h
index 2be75278203ba0b3a53b6c69da3cd3f3ae2e87c8..66f0d927b078e6a63b93ebbd1a8e1825a6f5b6b6 100644 (file)
--- a/src/structure.h
+++ b/src/structure.h
@@ -222,24 +222,24 @@ template <class Node>
 class PortMap : public Mutex, public std::map<Port, RefPointer<Node> > {
        typedef std::map<Port, RefPointer<Node> > _Map;
 public:
 class PortMap : public Mutex, public std::map<Port, RefPointer<Node> > {
        typedef std::map<Port, RefPointer<Node> > _Map;
 public:

-       bool contains(mach_port_t port) const   { return find(port) != end(); }
+       bool contains(mach_port_t port) const   { return this->find(port) != this->end(); }

        Node *getOpt(mach_port_t port) const
        {
        Node *getOpt(mach_port_t port) const
        {

-               typename _Map::const_iterator it = find(port);
-               return (it == end()) ? NULL : it->second;
+               typename _Map::const_iterator it = this->find(port);
+               return (it == this->end()) ? NULL : it->second;

        }
        
        Node *get(mach_port_t port) const
        {
        }
        
        Node *get(mach_port_t port) const
        {

-               typename _Map::const_iterator it = find(port);
-               assert(it != end());
+               typename _Map::const_iterator it = this->find(port);
+               assert(it != this->end());

                return it->second;
        }
        
        Node *get(mach_port_t port, OSStatus error) const
        {
                return it->second;
        }
        
        Node *get(mach_port_t port, OSStatus error) const
        {

-               typename _Map::const_iterator it = find(port);
-               if (it == end())
+               typename _Map::const_iterator it = this->find(port);
+               if (it == this->end())

                        MacOSError::throwMe(error);
                return it->second;
        }
                        MacOSError::throwMe(error);
                return it->second;
        }


@@ -250,7 +250,7 @@ public:
 template <class Node>
 void PortMap<Node>::dump()
 {
 template <class Node>
 void PortMap<Node>::dump()
 {

-       for (typename _Map::const_iterator it = begin(); it != end(); it++)
+       for (typename _Map::const_iterator it = this->begin(); it != this->end(); it++)

                it->second->dump();
 }
 
                it->second->dump();
 }
 

diff --git a/src/token.cpp b/src/token.cpp
index 34944c32a92393413556e18c9e56f0220e61acaa..2f3381bff2ebd732935c211683a369c765f7ee11 100644 (file)
--- a/src/token.cpp
+++ b/src/token.cpp
@@ -395,8 +395,8 @@ void Token::kill()
 void Token::notify(NotificationEvent event)
 {
     NameValueDictionary nvd;
 void Token::notify(NotificationEvent event)
 {
     NameValueDictionary nvd;

-       CssmSubserviceUid ssuid(mGuid, NULL, mSubservice,
-               CSSM_SERVICE_DL | CSSM_SERVICE_CSP);
+       CssmSubserviceUid ssuid(mGuid, NULL, h2n (mSubservice),
+               h2n(CSSM_SERVICE_DL | CSSM_SERVICE_CSP));

        nvd.Insert(new NameValuePair(SSUID_KEY, CssmData::wrap(ssuid)));
     CssmData data;
     nvd.Export(data);
        nvd.Insert(new NameValuePair(SSUID_KEY, CssmData::wrap(ssuid)));
     CssmData data;
     nvd.Export(data);

diff --git a/src/tokend.cpp b/src/tokend.cpp
index 170761801c4b7eb161c6867ac4a49309e48267a4..350752fa20907b0e9f31675f336a80f24ac79ae5 100644 (file)
--- a/src/tokend.cpp
+++ b/src/tokend.cpp
@@ -177,6 +177,13 @@ bool TokenDaemon::probe()
 }
 
 
 }
 
 

+//
+// FaultRelay
+//
+FaultRelay::~FaultRelay()
+{ /* virtual */ }
+
+

 //
 // Debug dump support
 //
 //
 // Debug dump support
 //

diff --git a/src/tokend.h b/src/tokend.h
index 6e407ab6bdd32dfebd8901ede3b02478709c7d38..e4b808a5904338337025605cc7b1604428c64fcc 100644 (file)
--- a/src/tokend.h
+++ b/src/tokend.h
@@ -41,6 +41,7 @@
 //
 class FaultRelay {
 public:
 //
 class FaultRelay {
 public:

+       virtual ~FaultRelay();

        virtual void relayFault(bool async) = 0;
 };
 
        virtual void relayFault(bool async) = 0;
 };
 

diff --git a/src/transition.cpp b/src/transition.cpp
index 63d12eb904c1e2bacb895116e9597041b81657da..c83169ba5a7fd51e7034f62463e82472a2acc750 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -189,8 +189,8 @@ kern_return_t ucsp_server_findFirst(UCSP_ARGS, DbHandle db,
        DATA_OUT(data), KeyHandle *hKey, SearchHandle *hSearch, RecordHandle *hRecord)
 {
        BEGIN_IPC
        DATA_OUT(data), KeyHandle *hKey, SearchHandle *hSearch, RecordHandle *hRecord)
 {
        BEGIN_IPC

-       relocate(query, queryBase, queryLength);
-       relocate(inAttributes, inAttributesBase, inAttributesLength);
+       relocate (query, queryBase, queryLength);
+       relocate (inAttributes, inAttributesBase, inAttributesLength);

 
        RefPointer<Database::Search> search;
        RefPointer<Database::Record> record;
 
        RefPointer<Database::Search> search;
        RefPointer<Database::Record> record;


@@ -212,11 +212,16 @@ kern_return_t ucsp_server_findFirst(UCSP_ARGS, DbHandle db,
                *hKey = key ? key->handle() : noKey;
 
                // return attributes (assumes relocated flat blob)
                *hKey = key ? key->handle() : noKey;
 
                // return attributes (assumes relocated flat blob)

-               flips(outAttrs, outAttributes, outAttributesBase);
+               flips(outAttrs, outAttributes, outAttributesBase); 
+               // flipCssmDbAttributeData(outAttrs, outAttributes, outAttributesBase); 

                *outAttributesLength = outAttrsLength;
 
                // return data (temporary fix)
                if (getData) {
                *outAttributesLength = outAttrsLength;
 
                // return data (temporary fix)
                if (getData) {

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

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


@@ -256,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();
                }


@@ -287,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();
        }

diff --git a/src/transwalkers.cpp b/src/transwalkers.cpp
index 0d8fa4a65534dbaf292a8d512be655474380cf3b..2a3055a66a0ece3f4b5c0b739839857ee600c857 100644 (file)
--- a/src/transwalkers.cpp
+++ b/src/transwalkers.cpp
@@ -111,3 +111,80 @@ Database *pickDb(Database *db1, Database *db2)
        // none at all. use the canonical transient store
        return Server::optionalDatabase(noDb);
 }
        // none at all. use the canonical transient store
        return Server::optionalDatabase(noDb);
 }

+
+
+
+void fixDbAttributes (CssmDbAttributeData &data)
+{
+       /*
+               NOTE TO FUTURE MAINTAINERS OF THIS CODE:
+               
+               This code is called by two different routines; the relocation walker on the input attributes, and flips
+               on the output attributtes.  This is bad, because the relocation walker flips the Info data structure,
+               and flips does not.  We could fix this in flips, but flips is a template and does different things
+               depending on what its parameters are.  As a result, the best place to do this is here.
+       */
+
+       // pull this data out first, so that it is unperverted once the flip occurs
+       unsigned limit = data.size ();
+       unsigned format = data.format ();
+       CssmData* values = data.values ();
+       
+       // flip if it is safe to do so
+       if (format > CSSM_DB_ATTRIBUTE_FORMAT_COMPLEX) // is the format screwed up?
+       {
+               flip (data.info ());
+               limit = data.size ();
+               format = data.format ();
+               values = data.values ();
+       }
+       
+       unsigned i;
+
+       for (i = 0; i < limit; ++i)
+       {
+               switch (format)
+               {
+                       case CSSM_DB_ATTRIBUTE_FORMAT_UINT32:
+                               Flippers::flip(*(uint32*) values[i].data ());
+                               break;
+                       
+                       case CSSM_DB_ATTRIBUTE_FORMAT_MULTI_UINT32:
+                       {
+                               CssmData& d = values[i];
+                               int numValues = d.length() / sizeof (UInt32);
+                               int j;
+                               UInt32* v = (UInt32*) d.data();
+                               for (j = 0; j < numValues; ++j)
+                               {
+                                       Flippers::flip (v[j]);
+                               }
+                       }
+                       break;
+               }
+       }
+}
+
+
+
+void fixDbAttributes (CssmQuery &query)
+{
+       unsigned i;
+       unsigned numItems = query.size ();
+       for (i = 0; i < numItems; ++i)
+       {
+               fixDbAttributes(query.predicates()[i].attribute());
+       }
+}
+
+
+
+void fixDbAttributes (CssmDbRecordAttributeData &data)
+{
+       unsigned i;
+       unsigned numItems = data.size ();
+       for (i = 0; i < numItems; ++i)
+       {
+               fixDbAttributes(data.attributes()[i]);
+       }
+}

diff --git a/src/transwalkers.h b/src/transwalkers.h
index 148ed226e8236956813883d7c4b8133339c86a7a..e9476a7992f333a07e70100d05ecd7b9027480f7 100644 (file)
--- a/src/transwalkers.h
+++ b/src/transwalkers.h
@@ -121,6 +121,17 @@ private:
 };
 
 
 };
 
 

+//
+// Fix DBAttributes, which have to be processed specially
+//
+void fixDbAttributes (CssmDbAttributeData &data);
+void fixDbAttributes (CssmQuery &query);
+void fixDbAttributes (CssmDbRecordAttributeData &data);
+
+template<class T>
+void fixDbAttributes(T &n) {} // handle the default case
+
+

 //
 // Process an incoming (IPC) data blob of type T.
 // This relocates pointers to fit in the local address space,
 //
 // Process an incoming (IPC) data blob of type T.
 // This relocates pointers to fit in the local address space,


@@ -135,6 +146,10 @@ void relocate(T *obj, T *base, size_t size)
         CheckingReconstituteWalker relocator(obj, base, size,
                        Server::process().byteFlipped());
         walk(relocator, base);
         CheckingReconstituteWalker relocator(obj, base, size,
                        Server::process().byteFlipped());
         walk(relocator, base);

+
+               // resolve weird type interdependency in DB_ATTRIBUTE_DATA
+               if (Server::process().byteFlipped())
+                       fixDbAttributes(*obj);

     }
 }
 
     }
 }
 


@@ -222,6 +237,8 @@ void flip(T &addr)
 }
 
 
 }
 
 

+void flipCssmDbAttributeData (CssmDbRecordAttributeData *value, CssmDbRecordAttributeData **&addr, CssmDbRecordAttributeData **&base);
+

 //
 // Take an object at value, flip it, and return appropriately flipped
 // addr/base pointers ready to be returned through IPC.
 //
 // Take an object at value, flip it, and return appropriately flipped
 // addr/base pointers ready to be returned through IPC.


@@ -232,6 +249,9 @@ void flips(T *value, T ** &addr, T ** &base)
 {
        *addr = *base = value;
        if (flipClient()) {
 {
        *addr = *base = value;
        if (flipClient()) {

+               // resolve weird type inter-dependency in DB_ATTRIBUTE_DATA
+               if (value)
+                       fixDbAttributes(*value);

                FlipWalker w;           // collector
                walk(w, value);         // collect all flippings needed
                w.doFlips();            // execute flips (flips value but leaves addr alone)
                FlipWalker w;           // collector
                walk(w, value);         // collect all flippings needed
                w.doFlips();            // execute flips (flips value but leaves addr alone)


@@ -239,7 +259,6 @@ void flips(T *value, T ** &addr, T ** &base)
        }
 }
 
        }
 }
 

-

 //
 // Take a DATA type RPC argument purportedly representing a Blob of some kind,
 // turn it into a Blob, and fail properly if it's not kosher.
 //
 // Take a DATA type RPC argument purportedly representing a Blob of some kind,
 // turn it into a Blob, and fail properly if it's not kosher.