From e881f6175af61a2ae004abc3d4964891d3a1fd79 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 3 May 2006 13:19:06 +0000 Subject: [PATCH] Update from stable branch. --- crypto/x509/x509_vpm.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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; -- 2.34.1