Update from stable branch.

diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 82cff88bf09d343fe6196dc3dceadfc356814b1e..5e69259a7934b40c9656a84f475c3c5118a1abc7 100644 (file)
--- 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);
 
        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;
 
        if (inh_flags & X509_VP_FLAG_RESET_FLAGS)
                dest->flags = 0;