diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-06-30 11:22:25 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-06-30 11:22:25 +0000 |
| commit | f67f8156240ba0ec8afabef1fba3bd6305a2c59e (patch) | |
| tree | 22be33bb9f81959122a64d6864964a1104a218cd /crypto | |
| parent | ab8fe43fa23e920c9ac535f7ca7d9a5e2aa92ebc (diff) | |
Update from 1.0.0-stable.
Diffstat (limited to 'crypto')
| -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 2b06718aec..01c5541e2e 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -198,8 +198,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) |