Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurity_apple_cspdl / lib / SSDLSession.cpp

diff --git a/OSX/libsecurity_apple_cspdl/lib/SSDLSession.cpp b/OSX/libsecurity_apple_cspdl/lib/SSDLSession.cpp
index 8fa42e4458de44a24609bf8246bb65f1bed8447a..5ead29307f458e9ea0a81c202c8e64044ff26d31 100644 (file)
--- a/OSX/libsecurity_apple_cspdl/lib/SSDLSession.cpp
+++ b/OSX/libsecurity_apple_cspdl/lib/SSDLSession.cpp
@@ -73,6 +73,8 @@ try
 }
 catch (...)
 {
 }
 catch (...)
 {

+    // Prevent re-throw of exception.
+    return;

 }
 
 // Utility functions
 }
 
 // Utility functions


@@ -117,7 +119,7 @@ SSDLSession::DbCreate(const char *inDbName,
        db->accessRequest(inAccessRequest);
        db->resourceControlContext(inCredAndAclEntry);
        db->openParameters(inOpenParameters);
        db->accessRequest(inAccessRequest);
        db->resourceControlContext(inCredAndAclEntry);
        db->openParameters(inOpenParameters);

-       db->create(DLDbIdentifier(CssmSubserviceUid(plugin.myGuid(), &version(), subserviceId(),
+       db->ssCreate(DLDbIdentifier(CssmSubserviceUid(plugin.myGuid(), &version(), subserviceId(),

                                                                                                CSSM_SERVICE_DL | CSSM_SERVICE_CSP),
                                                          inDbName, inDbLocation));
        db->dbInfo(NULL);
                                                                                                CSSM_SERVICE_DL | CSSM_SERVICE_CSP),
                                                          inDbName, inDbLocation));
        db->dbInfo(NULL);


@@ -139,7 +141,7 @@ SSDLSession::CreateWithBlob(const char *DbName,
        db->accessRequest(AccessRequest);
        db->resourceControlContext(NULL);
        db->openParameters(OpenParameters);
        db->accessRequest(AccessRequest);
        db->resourceControlContext(NULL);
        db->openParameters(OpenParameters);

-       db->createWithBlob(DLDbIdentifier(CssmSubserviceUid(plugin.myGuid(), &version(), subserviceId(),
+       db->ssCreateWithBlob(DLDbIdentifier(CssmSubserviceUid(plugin.myGuid(), &version(), subserviceId(),

                                                                          CSSM_SERVICE_DL | CSSM_SERVICE_CSP),
                                                                          DbName, DbLocation),
                                           blob);
                                                                          CSSM_SERVICE_DL | CSSM_SERVICE_CSP),
                                                                          DbName, DbLocation),
                                           blob);


@@ -160,7 +162,7 @@ SSDLSession::DbOpen(const char *inDbName,
        db->accessRequest(inAccessRequest);
        db->accessCredentials(inAccessCred);
        db->openParameters(inOpenParameters);
        db->accessRequest(inAccessRequest);
        db->accessCredentials(inAccessCred);
        db->openParameters(inOpenParameters);

-       db->open(DLDbIdentifier(CssmSubserviceUid(plugin.myGuid(), &version(), subserviceId(),
+       db->ssOpen(DLDbIdentifier(CssmSubserviceUid(plugin.myGuid(), &version(), subserviceId(),

                                                                                          CSSM_SERVICE_DL | CSSM_SERVICE_CSP),
                                                        inDbName, inDbLocation));
        outDbHandle = makeDbHandle(db);
                                                                                          CSSM_SERVICE_DL | CSSM_SERVICE_CSP),
                                                        inDbName, inDbLocation));
        outDbHandle = makeDbHandle(db);


@@ -267,7 +269,7 @@ SSDLSession::DataInsert(CSSM_DB_HANDLE inDbHandle,
 {
        SSDatabase db = findDbHandle(inDbHandle);
        // @@@ Fix client lib.
 {
        SSDatabase db = findDbHandle(inDbHandle);
        // @@@ Fix client lib.

-    SSUniqueRecord uniqueId = db->insert(inRecordType, inAttributes, inData, true); // @@@ Fix me
+    SSUniqueRecord uniqueId = db->ssInsert(inRecordType, inAttributes, inData);

        outUniqueId = makeSSUniqueRecord(uniqueId);
        // @@@ If this is a key do the right thing.
 }
        outUniqueId = makeSSUniqueRecord(uniqueId);
        // @@@ If this is a key do the right thing.
 }


@@ -1289,7 +1291,7 @@ SSDLSession::PassThrough(CSSM_DB_HANDLE inDbHandle,
                case CSSM_APPLECSPDL_DB_COPY_BLOB:
                {
                        // make the output parameters
                case CSSM_APPLECSPDL_DB_COPY_BLOB:
                {
                        // make the output parameters

-                       db->copyBlob(*reinterpret_cast<CSSM_DATA *>(outOutputParams));
+                       db->ssCopyBlob(*reinterpret_cast<CSSM_DATA *>(outOutputParams));

                        break;
                }
                case CSSM_APPLECSPDL_DB_INSERT_WITHOUT_ENCRYPTION:
                        break;
                }
                case CSSM_APPLECSPDL_DB_INSERT_WITHOUT_ENCRYPTION:


@@ -1312,6 +1314,52 @@ SSDLSession::PassThrough(CSSM_DB_HANDLE inDbHandle,
                        doConvertRecordIdentifier (db, inInputParams, outOutputParams);
                        break;
                }
                        doConvertRecordIdentifier (db, inInputParams, outOutputParams);
                        break;
                }

+        case CSSM_APPLECSPDL_DB_GET_BLOB_VERSION:
+        {
+            *((uint32*) *outOutputParams) = db->dbBlobVersion();
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_RECODE_TO_BLOB_VERSION:
+        {
+            *((uint32*) *outOutputParams) = db->recodeDbToVersion(*((uint32*) inInputParams));
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_RECODE_FINISHED:
+        {
+            db->recodeFinished();
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_TAKE_FILE_LOCK:
+        {
+            db->takeFileLock();
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_RELEASE_FILE_LOCK:
+        {
+            db->releaseFileLock(*((bool*) inInputParams));
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_MAKE_BACKUP:
+        {
+            db->makeBackup();
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_MAKE_COPY:
+        {
+            db->makeCopy((const char*) inInputParams);
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_DELETE_FILE:
+        {
+            db->deleteFile();
+            break;
+        }
+        case CSSM_APPLECSPDL_DB_CLONE:
+        {
+            SSDatabase ssdb = db->ssCloneTo(*((DLDbIdentifier*) inInputParams));
+            *((CSSM_DB_HANDLE*) outOutputParams) = makeDbHandle(ssdb);
+            break;
+        }

                default:
                {
                        CSSM_RETURN result = CSSM_DL_PassThrough(db->handle(), inPassThroughId, inInputParams, outOutputParams);
                default:
                {
                        CSSM_RETURN result = CSSM_DL_PassThrough(db->handle(), inPassThroughId, inInputParams, outOutputParams);