Ticket #40082: certsync.m.diff

files/certsync.m

@@ -33 +33 @@
 
 #import <objc/message.h>
 
+#define errSecSuccess 0
+
 /* A wrapper class that may be used to pass configuration through the
  * FSEvent callback API */
 @interface MPCertSyncConfig : NSObject {
@@ -215 +217 @@
     for (id certObj in result) {
         CFErrorRef cferror = NULL;
         CFStringRef subject;
+                OSStatus err;
+                
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6
+#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6
         if (SecCertificateCopyShortDescription != NULL) {
             subject = PLCFAutorelease(SecCertificateCopyShortDescription(NULL, (SecCertificateRef) certObj, &cferror));
         } else {
@@ -223 +227 @@
             subject = PLCFAutorelease(SecCertificateCopySubjectSummary((SecCertificateRef) certObj));
         }
 #else
-        subject = PLCFAutorelease(SecCertificateCopySubjectSummary((SecCertificateRef) certObj));
+                err = SecCertificateCopyCommonName((SecCertificateRef) certObj, &subject);
+                PLCFAutorelease(subject);
 #endif
 
-        if (subject == NULL) {
+        if (err != 0 && subject == NULL) {
             nsfprintf(stderr, @"Failed to extract certificate description: %@\n", cferror);
             [pool release];
             return EXIT_FAILURE;
@@ -242 +247 @@
     OSStatus err;
     
     /* Prefer the non-deprecated SecItemExport on Mac OS X >= 10.7. We use an ifdef to keep the code buildable with earlier SDKs, too. */
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6
+#if 0 && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6
     if (SecItemExport != NULL) {
         err = SecItemExport((CFArrayRef) anchors, kSecFormatPEMSequence, kSecItemPemArmour, NULL, &pemData);
     } else {
@@ -263 +268 @@
         NSString *str = [[[NSString alloc] initWithData: (NSData *) pemData encoding:NSUTF8StringEncoding] autorelease];
         nsfprintf(stdout, @"%@", str);
     } else {
-        if (![(NSData *) pemData writeToFile: outputFile options: NSDataWritingAtomic error: &error]) {
-            nsfprintf(stderr, @"Failed to write to pem output file: %@\n", error);
+        if (![(NSData *) pemData writeToFile: outputFile atomically: YES]) {
+            nsfprintf(stderr, @"Failed to write to pem output file.\n");
             [pool release];
             return EXIT_FAILURE;
         }