diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-01-04 15:37:24 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-01-04 15:37:24 +0000 |
| commit | 15cc5deec672e10389fc9143ae7975126210b835 (patch) | |
| tree | 1e968d4ddadeb4af00ccf37012d665ab7b2ffc27 /usr.sbin/rpki-client/parser.c | |
| parent | b307281eae253ee3db05bb49e2fcb464bd2f257b (diff) | |
Simplify the verify callback
The final warnx() is very noisy and essentially a remnant of earlier
debugging code. By ditching it and erroring directly on encountering
an unknown critical extension, the code becomes a bit simpler.
ok claudio
Diffstat (limited to 'usr.sbin/rpki-client/parser.c')
| -rw-r--r-- | usr.sbin/rpki-client/parser.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/usr.sbin/rpki-client/parser.c b/usr.sbin/rpki-client/parser.c index a878b31e6b5..c25f52645b4 100644 --- a/usr.sbin/rpki-client/parser.c +++ b/usr.sbin/rpki-client/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.30 2022/01/04 13:39:01 tb Exp $ */ +/* $OpenBSD: parser.c,v 1.31 2022/01/04 15:37:23 tb Exp $ */ /* * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org> * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> @@ -55,9 +55,6 @@ verify_cb(int ok, X509_STORE_CTX *store_ctx) ASN1_OBJECT *obj; char *file; int depth, error, i, nid; - int saw_ipAddrBlock = 0; - int saw_autonomousSysNum = 0; - int saw_unknown = 0; error = X509_STORE_CTX_get_error(store_ctx); depth = X509_STORE_CTX_get_error_depth(store_ctx); @@ -94,25 +91,16 @@ verify_cb(int ok, X509_STORE_CTX *store_ctx) nid = OBJ_obj2nid(obj); switch (nid) { case NID_sbgp_ipAddrBlock: - saw_ipAddrBlock = 1; - break; case NID_sbgp_autonomousSysNum: - saw_autonomousSysNum = 1; - break; + continue; default: warnx("%s: depth %d: unknown extension: nid %d", file, depth, nid); - saw_unknown = 1; - break; + return 0; } } - if (verbose > 1) - warnx("%s: depth %d, ipAddrBlock %d, autonomousSysNum %d", - file, depth, saw_ipAddrBlock, saw_autonomousSysNum); - - /* Fail if we saw an unknown extension. */ - return !saw_unknown; + return 1; } /* |