diff options
author | tb <> | 2025-03-04 08:43:25 +0000 |
---|---|---|
committer | tb <> | 2025-03-04 08:43:25 +0000 |
commit | 7cf910209b8c19059d2454d770b7774814cfdc6e (patch) | |
tree | 4d4e09744cc3fadcab60470f13a868c5e3469d9a | |
parent | 0f4669af9c443f6bea000a2816b6fee08e5e377b (diff) | |
download | openbsd-7cf910209b8c19059d2454d770b7774814cfdc6e.tar.gz openbsd-7cf910209b8c19059d2454d770b7774814cfdc6e.tar.bz2 openbsd-7cf910209b8c19059d2454d770b7774814cfdc6e.zip |
unifdef OPENSSL_NO_CHAIN_VERIFY
ok jsing
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index 5384686251..c93ae81bd8 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.146 2025/02/08 10:12:00 tb Exp $ */ | 1 | /* $OpenBSD: x509_vfy.c,v 1.147 2025/03/04 08:43:25 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 | * |
@@ -705,9 +705,6 @@ x509_vfy_get_trusted_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) | |||
705 | int | 705 | int |
706 | x509_vfy_check_chain_extensions(X509_STORE_CTX *ctx) | 706 | x509_vfy_check_chain_extensions(X509_STORE_CTX *ctx) |
707 | { | 707 | { |
708 | #ifdef OPENSSL_NO_CHAIN_VERIFY | ||
709 | return 1; | ||
710 | #else | ||
711 | int i, ok = 0, must_be_ca, plen = 0; | 708 | int i, ok = 0, must_be_ca, plen = 0; |
712 | X509 *x; | 709 | X509 *x; |
713 | int (*cb)(int xok, X509_STORE_CTX *xctx); | 710 | int (*cb)(int xok, X509_STORE_CTX *xctx); |
@@ -798,11 +795,11 @@ x509_vfy_check_chain_extensions(X509_STORE_CTX *ctx) | |||
798 | plen++; | 795 | plen++; |
799 | must_be_ca = 1; | 796 | must_be_ca = 1; |
800 | } | 797 | } |
798 | |||
801 | ok = 1; | 799 | ok = 1; |
802 | 800 | ||
803 | end: | 801 | end: |
804 | return ok; | 802 | return ok; |
805 | #endif | ||
806 | } | 803 | } |
807 | 804 | ||
808 | static int | 805 | static int |