diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2024-03-23 06:37:16 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-03-23 06:37:16 +0000 |
| commit | b184bd71dcd45f9a530aa344db828c26aa1a2c50 (patch) | |
| tree | 36eaca384d9b1f5e78ceb56ecf9bb520c60e9712 | |
| parent | d74e8a7348a1356e89036b537d1d750824b8e2d5 (diff) | |
Remove unused flags argument from the trust handlers
The public X509_check_trust() takes a flag parameter which we must leave
in place. However, we can stop passing the flag parameter around without
ever looking at it.
ok jsing
| -rw-r--r-- | lib/libcrypto/x509/x509_trs.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/libcrypto/x509/x509_trs.c b/lib/libcrypto/x509/x509_trs.c index 2f4cbba387b..0fd6f80df4b 100644 --- a/lib/libcrypto/x509/x509_trs.c +++ b/lib/libcrypto/x509/x509_trs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_trs.c,v 1.42 2024/03/02 10:50:26 tb Exp $ */ +/* $OpenBSD: x509_trs.c,v 1.43 2024/03/23 06:37:15 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -70,14 +70,14 @@ typedef struct x509_trust_st { int trust; int flags; - int (*check_trust)(struct x509_trust_st *, X509 *, int); + int (*check_trust)(struct x509_trust_st *, X509 *); char *name; int arg1; void *arg2; } X509_TRUST; static int -obj_trust(int id, X509 *x, int flags) +obj_trust(int id, X509 *x) { ASN1_OBJECT *obj; int i, nid; @@ -106,7 +106,7 @@ obj_trust(int id, X509 *x, int flags) } static int -trust_compat(X509_TRUST *trust, X509 *x, int flags) +trust_compat(X509_TRUST *trust, X509 *x) { X509_check_purpose(x, -1, 0); if (x->ex_flags & EXFLAG_SS) @@ -116,21 +116,21 @@ trust_compat(X509_TRUST *trust, X509 *x, int flags) } static int -trust_1oidany(X509_TRUST *trust, X509 *x, int flags) +trust_1oidany(X509_TRUST *trust, X509 *x) { if (x->aux && (x->aux->trust || x->aux->reject)) - return obj_trust(trust->arg1, x, flags); + return obj_trust(trust->arg1, x); /* we don't have any trust settings: for compatibility * we return trusted if it is self signed */ - return trust_compat(trust, x, flags); + return trust_compat(trust, x); } static int -trust_1oid(X509_TRUST *trust, X509 *x, int flags) +trust_1oid(X509_TRUST *trust, X509 *x) { if (x->aux) - return obj_trust(trust->arg1, x, flags); + return obj_trust(trust->arg1, x); return X509_TRUST_UNTRUSTED; } @@ -213,18 +213,18 @@ X509_check_trust(X509 *x, int trust_id, int flags) */ if (trust_id == 0) { int rv; - rv = obj_trust(NID_anyExtendedKeyUsage, x, 0); + rv = obj_trust(NID_anyExtendedKeyUsage, x); if (rv != X509_TRUST_UNTRUSTED) return rv; - return trust_compat(NULL, x, 0); + return trust_compat(NULL, x); } if (trust_id < X509_TRUST_MIN || trust_id > X509_TRUST_MAX) - return obj_trust(trust_id, x, flags); + return obj_trust(trust_id, x); idx = trust_id - X509_TRUST_MIN; trust = &trstandard[idx]; - return trust->check_trust((X509_TRUST *)trust, x, flags); + return trust->check_trust((X509_TRUST *)trust, x); } LCRYPTO_ALIAS(X509_check_trust); |