Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_apple_x509_tp / lib / TPCrlInfo.cpp

diff --git a/OSX/libsecurity_apple_x509_tp/lib/TPCrlInfo.cpp b/OSX/libsecurity_apple_x509_tp/lib/TPCrlInfo.cpp
index 54a5a24900a07a63bb547f14037b2192bbdb395b..5b1ca87f69c4e9eb47f25ce2b5461c8455088a2f 100644 (file)
--- a/OSX/libsecurity_apple_x509_tp/lib/TPCrlInfo.cpp
+++ b/OSX/libsecurity_apple_x509_tp/lib/TPCrlInfo.cpp
@@ -32,6 +32,7 @@
 #include <Security/oidscert.h>
 #include <Security/oidscrl.h>
 #include <security_cdsa_utilities/cssmerrors.h>
 #include <Security/oidscert.h>
 #include <Security/oidscrl.h>
 #include <security_cdsa_utilities/cssmerrors.h>

+#include <utilities/SecCFRelease.h>

 #include <string.h>                                            /* for memcmp */
 #include <Security/cssmapple.h>
 
 #include <string.h>                                            /* for memcmp */
 #include <Security/cssmapple.h>
 


@@ -291,6 +292,7 @@ CSSM_RETURN TPCrlInfo::parseExtensions(
                                                "CE_CDNT_NameRelativeToCrlIssuer not implemented\n");
                                     break;
                                 }
                                                "CE_CDNT_NameRelativeToCrlIssuer not implemented\n");
                                     break;
                                 }

+#if 0

                                 /* relativeName is a RDN sequence */
                                 CSSM_X509_RDN_PTR idpName = idp->distPointName->dpn.rdn;
                                 CSSM_X509_RDN_PTR certName = dp->distPointName->dpn.rdn;
                                 /* relativeName is a RDN sequence */
                                 CSSM_X509_RDN_PTR idpName = idp->distPointName->dpn.rdn;
                                 CSSM_X509_RDN_PTR certName = dp->distPointName->dpn.rdn;


@@ -311,6 +313,7 @@ CSSM_RETURN TPCrlInfo::parseExtensions(
                                     /* All the pairs matched. */
                                     found = CSSM_TRUE;
                                 }
                                     /* All the pairs matched. */
                                     found = CSSM_TRUE;
                                 }

+#endif

                             }
                             case CE_CDNT_FullName: {
                                 /* fullName is a GeneralNames sequence */
                             }
                             case CE_CDNT_FullName: {
                                 /* fullName is a GeneralNames sequence */


@@ -691,15 +694,13 @@ CSSM_RETURN TPCrlInfo::isCertRevoked(
        }
 
        subjectCert.freeField(&CSSMOID_X509V1SerialNumber, subjSerial);
        }
 
        subjectCert.freeField(&CSSMOID_X509V1SerialNumber, subjSerial);

+
+    CFReleaseNull(cfRevokedTime);
+    CFReleaseNull(cfVerifyTime);
+

        if(crtn && !subjectCert.addStatusCode(crtn)) {
                return CSSM_OK;
        }
        if(crtn && !subjectCert.addStatusCode(crtn)) {
                return CSSM_OK;
        }

-       if(cfRevokedTime) {
-               CFRelease(cfRevokedTime);
-       }
-       if(cfVerifyTime) {
-               CFRelease(cfVerifyTime);
-       }

        return crtn;
 }
 
        return crtn;
 }