From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 2 Nov 2010 15:57:00 +0000 (+0000)
Subject: Submitted by: Jonathan Dixon <joth@chromium.org>
X-Git-Tag: OpenSSL_0_9_8p~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e8b8b899053124697217173b039ff3e45578c58;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 b2f9290d5a..aeb6337688 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -1375,7 +1375,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)
 		{