diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-05-03 13:19:06 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-05-03 13:19:06 +0000 |
| commit | e881f6175af61a2ae004abc3d4964891d3a1fd79 (patch) | |
| tree | a72886fc882dc0ebf9469099c158ceb2327ce2e3 /crypto/x509/x509_vpm.c | |
| parent | 36e77b1059ed7ba6c1852de2b1e63ffc48150d66 (diff) | |
| download | openssl-e881f6175af61a2ae004abc3d4964891d3a1fd79.tar.gz | |
Update from stable branch.
Diffstat (limited to 'crypto/x509/x509_vpm.c')
| -rw-r--r-- | crypto/x509/x509_vpm.c | 9 |
1 files changed, 9 insertions, 0 deletions
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; |