diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2001-08-01 19:51:18 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2001-08-01 19:51:18 +0000 |
| commit | 38223f1fe95067b826a997cfe88963e9e93cf6c9 (patch) | |
| tree | 54b73def4615fc41d3103d101265ee0a2024baa6 /lib/libcrypto/x509/x509_trs.c | |
| parent | 98ba4ab2de5732015ef5842227bc313d6f6c67ae (diff) | |
merge openssl 0.9.6b-engine
Note that this is a maintenence release, API's appear *not* to have changed.
As such, I have only increased the minor number on these libraries
Diffstat (limited to 'lib/libcrypto/x509/x509_trs.c')
| -rw-r--r-- | lib/libcrypto/x509/x509_trs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/x509/x509_trs.c b/lib/libcrypto/x509/x509_trs.c index a7b1543461b..86b3b79dcc0 100644 --- a/lib/libcrypto/x509/x509_trs.c +++ b/lib/libcrypto/x509/x509_trs.c @@ -228,7 +228,8 @@ int X509_TRUST_get_trust(X509_TRUST *xp) static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags) { - if(x->aux) return obj_trust(trust->arg1, x, flags); + if(x->aux && (x->aux->trust || x->aux->reject)) + return obj_trust(trust->arg1, x, flags); /* we don't have any trust settings: for compatibility * we return trusted if it is self signed */ |