Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_cssm / lib / cssmapplePriv.h

diff --git a/OSX/libsecurity_cssm/lib/cssmapplePriv.h b/OSX/libsecurity_cssm/lib/cssmapplePriv.h
index f5dc442e01472d623e48753f73fce8282fa7af2c..c9dbc7272e9ca2b463dc4db3519af51b111792be 100644 (file)
--- a/OSX/libsecurity_cssm/lib/cssmapplePriv.h
+++ b/OSX/libsecurity_cssm/lib/cssmapplePriv.h
@@ -26,6 +26,10 @@
 #ifndef _CSSMAPPLE_PRIV_H_
 #define _CSSMAPPLE_PRIV_H_  1
 
 #ifndef _CSSMAPPLE_PRIV_H_
 #define _CSSMAPPLE_PRIV_H_  1
 

+#include <TargetConditionals.h>
+
+#if TARGET_OS_OSX
+

 #include <Security/cssmtype.h>
 #include <Security/cssmapple.h>
 
 #include <Security/cssmtype.h>
 #include <Security/cssmapple.h>
 


@@ -63,12 +67,12 @@ enum {
        CSSM_TP_OCSP_REQUIRE_RESP_NONCE                                 = 0x00000080
 };
 
        CSSM_TP_OCSP_REQUIRE_RESP_NONCE                                 = 0x00000080
 };
 

-typedef struct {
+typedef struct DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER {

        uint32                                                  Version;        
        CSSM_APPLE_TP_OCSP_OPT_FLAGS    Flags;
        CSSM_DATA_PTR                                   LocalResponder;         /* URI */
        CSSM_DATA_PTR                                   LocalResponderCert;     /* X509 DER encoded cert */
        uint32                                                  Version;        
        CSSM_APPLE_TP_OCSP_OPT_FLAGS    Flags;
        CSSM_DATA_PTR                                   LocalResponder;         /* URI */
        CSSM_DATA_PTR                                   LocalResponderCert;     /* X509 DER encoded cert */

-} CSSM_APPLE_TP_OCSP_OPTIONS;
+} CSSM_APPLE_TP_OCSP_OPTIONS DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;

 
 enum
 {
 
 enum
 {


@@ -101,45 +105,70 @@ enum
     
     // stash a DB key
     CSSM_APPLECSPDL_DB_STASH = CSSM_APPLE_PRIVATE_CSPDL_CODE_17,
     
     // stash a DB key
     CSSM_APPLECSPDL_DB_STASH = CSSM_APPLE_PRIVATE_CSPDL_CODE_17,

-    CSSM_APPLECSPDL_DB_STASH_CHECK = CSSM_APPLE_PRIVATE_CSPDL_CODE_18
-       
+    CSSM_APPLECSPDL_DB_STASH_CHECK = CSSM_APPLE_PRIVATE_CSPDL_CODE_18,
+
+    // Ask the CSPDL for its database blob version number.
+    CSSM_APPLECSPDL_DB_GET_BLOB_VERSION = CSSM_APPLE_PRIVATE_CSPDL_CODE_19,
+
+    // Recode this database blob into a new blob version
+    CSSM_APPLECSPDL_DB_RECODE_TO_BLOB_VERSION = CSSM_APPLE_PRIVATE_CSPDL_CODE_20,
+
+    // Try to take the file lock on the underlying database
+    // You should probably be sure that autocommit is off before taking this
+    CSSM_APPLECSPDL_DB_TAKE_FILE_LOCK = CSSM_APPLE_PRIVATE_CSPDL_CODE_21,
+    CSSM_APPLECSPDL_DB_RELEASE_FILE_LOCK = CSSM_APPLE_PRIVATE_CSPDL_CODE_22,
+
+    // Make a backup of this database on the filesystem
+    CSSM_APPLECSPDL_DB_MAKE_BACKUP = CSSM_APPLE_PRIVATE_CSPDL_CODE_23,
+
+    // Make a copy of this database on the filesystem
+    CSSM_APPLECSPDL_DB_MAKE_COPY = CSSM_APPLE_PRIVATE_CSPDL_CODE_24,
+
+    // Make a clone of this database on the filesystem, and tell securityd about it
+    CSSM_APPLECSPDL_DB_CLONE = CSSM_APPLE_PRIVATE_CSPDL_CODE_25,
+
+    // Delete the file underlying this database
+    CSSM_APPLECSPDL_DB_DELETE_FILE = CSSM_APPLE_PRIVATE_CSPDL_CODE_26,
+
+    // Recoding of this database is complete
+    CSSM_APPLECSPDL_DB_RECODE_FINISHED = CSSM_APPLE_PRIVATE_CSPDL_CODE_27,

 };
 
 /* AppleCSPDL passthrough parameters */
 };
 
 /* AppleCSPDL passthrough parameters */

-typedef struct cssm_applecspdl_db_recode_parameters
+typedef struct DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER cssm_applecspdl_db_recode_parameters

 {
        CSSM_DATA dbBlob;
        CSSM_DATA extraData;
 {
        CSSM_DATA dbBlob;
        CSSM_DATA extraData;

-} CSSM_APPLECSPDL_RECODE_PARAMETERS, *CSSM_APPLECSPDL_RECODE_PARAMETERS_PTR;
+} CSSM_APPLECSPDL_RECODE_PARAMETERS DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER, *CSSM_APPLECSPDL_RECODE_PARAMETERS_PTR DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;

 
 

-typedef struct cssm_applecspdl_db_copy_blob_parameters
+typedef struct DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER cssm_applecspdl_db_copy_blob_parameters

 {
        CSSM_DATA blob;
 {
        CSSM_DATA blob;

-} CSSM_APPLECSPDL_DB_COPY_BLOB_PARAMETERS;
+} CSSM_APPLECSPDL_DB_COPY_BLOB_PARAMETERS DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;

 
 

-typedef struct cssm_applecspdl_db_insert_without_encryption_parameters
+typedef struct DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER cssm_applecspdl_db_insert_without_encryption_parameters

 {
        CSSM_DB_RECORDTYPE recordType;
        CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR attributes;
        CSSM_DATA data;
 {
        CSSM_DB_RECORDTYPE recordType;
        CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR attributes;
        CSSM_DATA data;

-} CSSM_APPLECSPDL_DB_INSERT_WITHOUT_ENCRYPTION_PARAMETERS;
+} CSSM_APPLECSPDL_DB_INSERT_WITHOUT_ENCRYPTION_PARAMETERS DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;

 
 

-typedef struct cssm_applecspdl_db_modify_without_encryption_parameters
+typedef struct DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER cssm_applecspdl_db_modify_without_encryption_parameters

 {
        CSSM_DB_RECORDTYPE recordType;
        CSSM_DB_UNIQUE_RECORD_PTR uniqueID;
        CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR attributes;
        CSSM_DATA *data;
        CSSM_DB_MODIFY_MODE modifyMode;
 {
        CSSM_DB_RECORDTYPE recordType;
        CSSM_DB_UNIQUE_RECORD_PTR uniqueID;
        CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR attributes;
        CSSM_DATA *data;
        CSSM_DB_MODIFY_MODE modifyMode;

-} CSSM_APPLECSPDL_DB_MODIFY_WITHOUT_ENCRYPTION_PARAMETERS;
+} CSSM_APPLECSPDL_DB_MODIFY_WITHOUT_ENCRYPTION_PARAMETERS DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;

 
 

-typedef struct cssm_applecspdl_db_get_without_encryption_parameters
+typedef struct DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER cssm_applecspdl_db_get_without_encryption_parameters

 {
        CSSM_DB_UNIQUE_RECORD_PTR uniqueID;
        CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR attributes;
 {
        CSSM_DB_UNIQUE_RECORD_PTR uniqueID;
        CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR attributes;

-} CSSM_APPLECSPDL_DB_GET_WITHOUT_ENCRYPTION_PARAMETERS;
+} CSSM_APPLECSPDL_DB_GET_WITHOUT_ENCRYPTION_PARAMETERS DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;

 
 

-typedef struct cssm_applecspdl_db_create_with_blob_parameters
+typedef struct DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER cssm_applecspdl_db_create_with_blob_parameters

 {
        const char *dbName;
        const CSSM_NET_ADDRESS *dbLocation;
 {
        const char *dbName;
        const CSSM_NET_ADDRESS *dbLocation;


@@ -148,10 +177,12 @@ typedef struct cssm_applecspdl_db_create_with_blob_parameters
        const CSSM_RESOURCE_CONTROL_CONTEXT *credAndAclEntry;
        const void *openParameters;
        const CSSM_DATA *blob;
        const CSSM_RESOURCE_CONTROL_CONTEXT *credAndAclEntry;
        const void *openParameters;
        const CSSM_DATA *blob;

-} CSSM_APPLE_CSPDL_DB_CREATE_WITH_BLOB_PARAMETERS;
+} CSSM_APPLE_CSPDL_DB_CREATE_WITH_BLOB_PARAMETERS DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;

 
 #ifdef __cplusplus
 }
 #endif
 
 
 #ifdef __cplusplus
 }
 #endif
 

+#endif /* TARGET_OS_OSX */
+

 #endif /* _CSSMAPPLE_PRIV_H_ */
 #endif /* _CSSMAPPLE_PRIV_H_ */