From: Andy Polyakov <appro@openssl.org>
Date: Sun, 29 Jul 2018 12:13:32 +0000 (+0200)
Subject: x509v3/v3_purp.c: resolve Thread Sanitizer nit.
X-Git-Tag: OpenSSL_1_0_2q~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9804228a4313fcdff1cface0f87ce8b8ed180259;p=oweals%2Fopenssl.git

x509v3/v3_purp.c: resolve Thread Sanitizer nit.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6916)

(cherry picked from commit 0da7358b0757fa35f2c3a8f51fa036466ae50fd7)

Resolved conflicts:
	crypto/x509v3/v3_purp.c
---

diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c
index 7080a51c4c..6d3aa8f731 100644
--- a/crypto/x509v3/v3_purp.c
+++ b/crypto/x509v3/v3_purp.c
@@ -396,12 +396,8 @@ static void x509v3_cache_extensions(X509 *x)
     ASN1_BIT_STRING *ns;
     EXTENDED_KEY_USAGE *extusage;
     X509_EXTENSION *ex;
-
     int i;
 
-    if (x->ex_flags & EXFLAG_SET)
-        return;
-
     CRYPTO_w_lock(CRYPTO_LOCK_X509);
     if (x->ex_flags & EXFLAG_SET) {
         CRYPTO_w_unlock(CRYPTO_LOCK_X509);