Security-58286.51.6.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / SecBridge.h

diff --git a/OSX/libsecurity_keychain/lib/SecBridge.h b/OSX/libsecurity_keychain/lib/SecBridge.h
index 7cfad6730674875bbb46faa1da97df32729ceb7f..ed923939fa8fb9d201d29ac7c1c7c564e3ab2b64 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecBridge.h
+++ b/OSX/libsecurity_keychain/lib/SecBridge.h
@@ -71,7 +71,6 @@ using namespace KeychainCore;
 // BEGIN_SECKCITEMAPI
 // Note: this macro assumes an input parameter named "itemRef"
 //
-#if SECTRUST_OSX
 #define BEGIN_SECKCITEMAPI \
        OSStatus __secapiresult=errSecSuccess; \
        SecKeychainItemRef __itemImplRef=NULL; \
@@ -90,12 +89,7 @@ using namespace KeychainCore;
                __itemImplRef=(SecKeychainItemRef)((itemRef) ? CFRetain(itemRef) : NULL); \
        } \
        try {
-#else
-#define BEGIN_SECKCITEMAPI \
-       OSStatus __secapiresult=errSecSuccess; \
-       SecKeychainItemRef __itemImplRef=(SecKeychainItemRef)((itemRef) ? CFRetain(itemRef) : NULL); \
-       try {
-#endif
+
 //
 // END_SECKCITEMAPI
 //
@@ -112,7 +106,6 @@ using namespace KeychainCore;
 // BEGIN_SECCERTAPI
 // Note: this macro assumes an input parameter named "certificate"
 //
-#if SECTRUST_OSX
 #define BEGIN_SECCERTAPI \
        OSStatus __secapiresult=errSecSuccess; \
        SecCertificateRef __itemImplRef=NULL; \
@@ -121,12 +114,7 @@ using namespace KeychainCore;
        if (!__itemImplRef && certificate) { __itemImplRef=SecCertificateCreateItemImplInstance(certificate); \
                (void)SecCertificateSetKeychainItem(certificate,__itemImplRef); } \
        try {
-#else
-#define BEGIN_SECCERTAPI \
-       OSStatus __secapiresult=errSecSuccess; \
-       SecCertificateRef __itemImplRef=(SecCertificateRef)((certificate)?CFRetain(certificate):NULL); \
-       try {
-#endif
+
 //
 // END_SECCERTAPI
 //