From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 2 Nov 2010 15:57:40 +0000 (+0000)
Subject: Submitted by: Jonathan Dixon <joth@chromium.org>
X-Git-Tag: OpenSSL_1_0_0b~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0af0e9d747c4aeacbecc16157a950ad9b3a8a6b9;p=oweals%2Fopenssl.git

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 87ebf62525..bd6695d0c1 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -2034,7 +2034,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)
 		{