Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / SecCertificate.cpp

diff --git a/OSX/libsecurity_keychain/lib/SecCertificate.cpp b/OSX/libsecurity_keychain/lib/SecCertificate.cpp
index 8c3454c668d354526283b234ed5573ee7ddd9e98..dcd447b4982b69f94d6bb56dfece684461658a4c 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecCertificate.cpp
+++ b/OSX/libsecurity_keychain/lib/SecCertificate.cpp
@@ -45,8 +45,6 @@
 #include <sys/param.h>
 #include <syslog.h>
 #include "CertificateValues.h"
 #include <sys/param.h>
 #include <syslog.h>
 #include "CertificateValues.h"

-#include "SecCertificateP.h"
-#include "SecCertificatePrivP.h"

 
 #include "AppleBaselineEscrowCertificates.h"
 
 
 #include "AppleBaselineEscrowCertificates.h"
 


@@ -54,11 +52,7 @@
 OSStatus SecCertificateGetCLHandle_legacy(SecCertificateRef certificate, CSSM_CL_HANDLE *clHandle);
 extern CSSM_KEYUSE ConvertArrayToKeyUsage(CFArrayRef usage);
 
 OSStatus SecCertificateGetCLHandle_legacy(SecCertificateRef certificate, CSSM_CL_HANDLE *clHandle);
 extern CSSM_KEYUSE ConvertArrayToKeyUsage(CFArrayRef usage);
 

-#define SEC_CONST_DECL(k,v) const CFStringRef k = CFSTR(v);

 
 

-SEC_CONST_DECL (kSecCertificateProductionEscrowKey, "ProductionEscrowKey");
-SEC_CONST_DECL (kSecCertificateProductionPCSEscrowKey, "ProductionPCSEscrowKey");
-SEC_CONST_DECL (kSecCertificateEscrowFileName, "AppleESCertificates");

 
 
 using namespace CssmClient;
 
 
 using namespace CssmClient;


@@ -352,18 +346,6 @@ SecCertificateGetEmailAddress(SecCertificateRef certificate, CFStringRef *emailA
     END_SECCERTAPI
 }
 
     END_SECCERTAPI
 }
 

-/* OS X only */
-OSStatus
-SecCertificateCopyEmailAddresses(SecCertificateRef certificate, CFArrayRef *emailAddresses)
-{
-    // This macro creates an ItemImpl certificate if it does not exist
-    BEGIN_SECCERTAPI
-
-    Required(emailAddresses) = Certificate::required(__itemImplRef)->copyEmailAddresses();
-
-    END_SECCERTAPI
-}
-

 /* Return a zero terminated list of CSSM_DATA_PTR's with the values of the field specified by field.
  * Caller must call releaseFieldValues to free the storage allocated by this call.
  *
 /* Return a zero terminated list of CSSM_DATA_PTR's with the values of the field specified by field.
  * Caller must call releaseFieldValues to free the storage allocated by this call.
  *


@@ -805,20 +787,28 @@ OSStatus SecCertificateSetPreference(
        const char *templateStr = "%s [key usage 0x%X]";
        const int keyUsageMaxStrLen = 8;
        accountUTF8Len += strlen(templateStr) + keyUsageMaxStrLen;
        const char *templateStr = "%s [key usage 0x%X]";
        const int keyUsageMaxStrLen = 8;
        accountUTF8Len += strlen(templateStr) + keyUsageMaxStrLen;

-       char accountUTF8[accountUTF8Len];
+       char *accountUTF8 = (char *)malloc(accountUTF8Len);
+       if (!accountUTF8) {
+               MacOSError::throwMe(errSecMemoryError);
+       }

     if (!CFStringGetCString(labelStr, accountUTF8, accountUTF8Len-1, kCFStringEncodingUTF8))
                accountUTF8[0] = (char)'\0';
        if (keyUsage)
                snprintf(accountUTF8, accountUTF8Len-1, templateStr, accountUTF8, keyUsage);
     if (!CFStringGetCString(labelStr, accountUTF8, accountUTF8Len-1, kCFStringEncodingUTF8))
                accountUTF8[0] = (char)'\0';
        if (keyUsage)
                snprintf(accountUTF8, accountUTF8Len-1, templateStr, accountUTF8, keyUsage);

-    CssmData account(const_cast<char *>(accountUTF8), strlen(accountUTF8));
+    CssmDataContainer account(const_cast<char *>(accountUTF8), strlen(accountUTF8));
+    free(accountUTF8);

     CFRelease(labelStr);
 
        // service attribute (name provided by the caller)
        CFIndex serviceUTF8Len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(name), kCFStringEncodingUTF8) + 1;;
     CFRelease(labelStr);
 
        // service attribute (name provided by the caller)
        CFIndex serviceUTF8Len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(name), kCFStringEncodingUTF8) + 1;;

-       char serviceUTF8[serviceUTF8Len];
+       char *serviceUTF8 = (char *)malloc(serviceUTF8Len);
+       if (!serviceUTF8) {
+               MacOSError::throwMe(errSecMemoryError);
+       }

     if (!CFStringGetCString(name, serviceUTF8, serviceUTF8Len-1, kCFStringEncodingUTF8))
         serviceUTF8[0] = (char)'\0';
     if (!CFStringGetCString(name, serviceUTF8, serviceUTF8Len-1, kCFStringEncodingUTF8))
         serviceUTF8[0] = (char)'\0';

-    CssmData service(const_cast<char *>(serviceUTF8), strlen(serviceUTF8));
+    CssmDataContainer service(const_cast<char *>(serviceUTF8), strlen(serviceUTF8));
+    free(serviceUTF8);

 
     // look for existing preference item, in case this is an update
        StorageManager::KeychainList keychains;
 
     // look for existing preference item, in case this is an update
        StorageManager::KeychainList keychains;


@@ -1004,3 +994,20 @@ bool SecCertificateIsValidX(SecCertificateRef certificate, CFAbsoluteTime verify
      */
        return SecCertificateIsValid(certificate, verifyTime);
 }
      */
        return SecCertificateIsValid(certificate, verifyTime);
 }

+
+/* OS X only */
+CFDataRef SecCertificateCopyPublicKeySHA1DigestFromCertificateData(CFAllocatorRef allocator,
+                                                                   CFDataRef der_certificate)
+{
+    CFDataRef result = NULL;
+    SecCertificateRef iosCertRef = SecCertificateCreateWithData(allocator, der_certificate);
+    if (NULL == iosCertRef)
+    {
+        return result;
+    }
+
+    result = SecCertificateCopyPublicKeySHA1Digest(iosCertRef);
+    CFRelease(iosCertRef);
+    return result;
+}
+