summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2023-12-22 13:42:18 +0000
committertb <>2023-12-22 13:42:18 +0000
commit8e158caa1a1fad0bca8fdc9c1f27e279af084525 (patch)
tree1851fa354282f26a875af711aa58610b7696e448 /src/lib
parentc1690c8aac8d59ac83cb18c8874b181260876365 (diff)
downloadopenbsd-8e158caa1a1fad0bca8fdc9c1f27e279af084525.tar.gz
openbsd-8e158caa1a1fad0bca8fdc9c1f27e279af084525.tar.bz2
openbsd-8e158caa1a1fad0bca8fdc9c1f27e279af084525.zip
Replace check_chain_extensions() with its x509_vfy_ wrapper
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index ba5f92c87b..674ef1df04 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_vfy.c,v 1.131 2023/12/22 13:36:20 tb Exp $ */ 1/* $OpenBSD: x509_vfy.c,v 1.132 2023/12/22 13:42:18 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -123,7 +123,6 @@ static int null_callback(int ok, X509_STORE_CTX *e);
123static int check_issued(X509_STORE_CTX *ctx, X509 *subject, X509 *issuer); 123static int check_issued(X509_STORE_CTX *ctx, X509 *subject, X509 *issuer);
124static X509 *find_issuer(X509_STORE_CTX *ctx, STACK_OF(X509) *sk, X509 *x, 124static X509 *find_issuer(X509_STORE_CTX *ctx, STACK_OF(X509) *sk, X509 *x,
125 int allow_expired); 125 int allow_expired);
126static int check_chain_extensions(X509_STORE_CTX *ctx);
127static int check_name_constraints(X509_STORE_CTX *ctx); 126static int check_name_constraints(X509_STORE_CTX *ctx);
128static int check_trust(X509_STORE_CTX *ctx); 127static int check_trust(X509_STORE_CTX *ctx);
129static int check_cert(X509_STORE_CTX *ctx, STACK_OF(X509) *chain, int depth); 128static int check_cert(X509_STORE_CTX *ctx, STACK_OF(X509) *chain, int depth);
@@ -528,7 +527,7 @@ X509_verify_cert_legacy(X509_STORE_CTX *ctx)
528 goto end; 527 goto end;
529 528
530 /* We have the chain complete: now we need to check its purpose */ 529 /* We have the chain complete: now we need to check its purpose */
531 ok = check_chain_extensions(ctx); 530 ok = x509_vfy_check_chain_extensions(ctx);
532 if (!ok) 531 if (!ok)
533 goto end; 532 goto end;
534 533
@@ -810,11 +809,6 @@ end:
810} 809}
811 810
812static int 811static int
813check_chain_extensions(X509_STORE_CTX *ctx) {
814 return x509_vfy_check_chain_extensions(ctx);
815}
816
817static int
818check_name_constraints(X509_STORE_CTX *ctx) 812check_name_constraints(X509_STORE_CTX *ctx)
819{ 813{
820 if (!x509_constraints_chain(ctx->chain, &ctx->error, 814 if (!x509_constraints_chain(ctx->chain, &ctx->error,