Make X509_PUBKEY opaque

[openssl.git] / crypto / x509v3 / v3_utl.c

diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index 66b5711aff928697bca033596add7596c21ea209..a220b27ab950933d75cfb0945df53cc6c0150b09 100644 (file)
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -978,14 +978,12 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
         GENERAL_NAMES_free(gens);
         if (rv != 0)
             return rv;
         GENERAL_NAMES_free(gens);
         if (rv != 0)
             return rv;

-        if (cnid == NID_undef
-            || (san_present
-                && !(flags & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT)))
+        if (san_present && !(flags & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT))

             return 0;
     }
 
     /* We're done if CN-ID is not pertinent */
             return 0;
     }
 
     /* We're done if CN-ID is not pertinent */

-    if (cnid == NID_undef)
+    if (cnid == NID_undef || (flags & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT))

         return 0;
 
     i = -1;
         return 0;
 
     i = -1;