From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 3 May 2006 13:19:06 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~1352
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e881f6175af61a2ae004abc3d4964891d3a1fd79;p=oweals%2Fopenssl.git

Update from stable branch.
---

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 82cff88bf0..5e69259a79 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -172,6 +172,15 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
 	x509_verify_param_copy(trust, 0);
 	x509_verify_param_copy(depth, -1);
 
+	/* If overwrite or check time not set, copy across */
+
+	if (to_overwrite || !(dest->flags & X509_V_FLAG_USE_CHECK_TIME))
+		{
+		dest->check_time = src->check_time;
+		dest->flags &= ~X509_V_FLAG_USE_CHECK_TIME;
+		/* Don't need to copy flag: that is done below */
+		}
+
 	if (inh_flags & X509_VP_FLAG_RESET_FLAGS)
 		dest->flags = 0;