From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 2 Nov 2010 15:58:58 +0000 (+0000)
Subject: Submitted by: Jonathan Dixon <joth@chromium.org>
X-Git-Tag: OpenSSL-fips-2_0-rc1~954
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=da7b0b2261d0365b3bc7110adf2a8773cf513cf4;hp=beee17c4288fb8800c266d6f6cfb38850239105f

Submitted by: Jonathan Dixon <joth@chromium.org>
Reviewed by: steve

If store is NULL set flags correctly.
---

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 7bac3c6f24..fadf712e4b 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -2061,7 +2061,7 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
 	if (store)
 		ret = X509_VERIFY_PARAM_inherit(ctx->param, store->param);
 	else
-		ctx->param->flags |= X509_VP_FLAG_DEFAULT|X509_VP_FLAG_ONCE;
+		ctx->param->inh_flags |= X509_VP_FLAG_DEFAULT|X509_VP_FLAG_ONCE;
 
 	if (store)
 		{