diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-06-30 13:24:57 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-06-30 13:24:57 +0200 |
| commit | 508c53522145ccd59b330e789a07470c79e87770 (patch) | |
| tree | 319b395cd03d71b1def8dc457fc143e9c82aecd0 /crypto/x509 | |
| parent | Allow setting of verify depth in verify parameters (as opposed to the depth (diff) | |
| download | openssl-508c53522145ccd59b330e789a07470c79e87770.tar.xz openssl-508c53522145ccd59b330e789a07470c79e87770.zip | |
Update from 1.0.0-stable
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_vpm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index acc50f97d5..dfd89d89fa 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -199,8 +199,12 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest, int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to, const X509_VERIFY_PARAM *from) { + unsigned long save_flags = to->inh_flags; + int ret; to->inh_flags |= X509_VP_FLAG_DEFAULT; - return X509_VERIFY_PARAM_inherit(to, from); + ret = X509_VERIFY_PARAM_inherit(to, from); + to->inh_flags = save_flags; + return ret; } int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) |