diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_lu.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_lu.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c index 584251d18f..05730f56cc 100644 --- a/src/lib/libcrypto/x509/x509_lu.c +++ b/src/lib/libcrypto/x509/x509_lu.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_lu.c,v 1.59 2023/04/16 08:30:21 tb Exp $ */ | 1 | /* $OpenBSD: x509_lu.c,v 1.60 2023/04/25 18:32:42 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 | * |
@@ -593,13 +593,8 @@ X509_get1_certs_from_cache(X509_STORE *store, X509_NAME *name) | |||
593 | return NULL; | 593 | return NULL; |
594 | } | 594 | } |
595 | 595 | ||
596 | #if defined(LIBRESSL_NEXT_API) | ||
597 | STACK_OF(X509) * | 596 | STACK_OF(X509) * |
598 | X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *name) | 597 | X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx, X509_NAME *name) |
599 | #else | ||
600 | STACK_OF(X509) * | ||
601 | X509_STORE_get1_certs(X509_STORE_CTX *ctx, X509_NAME *name) | ||
602 | #endif | ||
603 | { | 598 | { |
604 | X509_STORE *store = ctx->store; | 599 | X509_STORE *store = ctx->store; |
605 | STACK_OF(X509) *sk; | 600 | STACK_OF(X509) *sk; |
@@ -619,19 +614,10 @@ X509_STORE_get1_certs(X509_STORE_CTX *ctx, X509_NAME *name) | |||
619 | 614 | ||
620 | return X509_get1_certs_from_cache(store, name); | 615 | return X509_get1_certs_from_cache(store, name); |
621 | } | 616 | } |
622 | #if defined(LIBRESSL_NEXT_API) | ||
623 | LCRYPTO_ALIAS(X509_STORE_CTX_get1_certs); | 617 | LCRYPTO_ALIAS(X509_STORE_CTX_get1_certs); |
624 | #else | ||
625 | LCRYPTO_ALIAS(X509_STORE_get1_certs); | ||
626 | #endif | ||
627 | 618 | ||
628 | #if defined(LIBRESSL_NEXT_API) | ||
629 | STACK_OF(X509_CRL) * | 619 | STACK_OF(X509_CRL) * |
630 | X509_STORE_CTX_get1_crls(X509_STORE_CTX *ctx, X509_NAME *name) | 620 | X509_STORE_CTX_get1_crls(X509_STORE_CTX *ctx, X509_NAME *name) |
631 | #else | ||
632 | STACK_OF(X509_CRL) * | ||
633 | X509_STORE_get1_crls(X509_STORE_CTX *ctx, X509_NAME *name) | ||
634 | #endif | ||
635 | { | 621 | { |
636 | X509_STORE *store = ctx->store; | 622 | X509_STORE *store = ctx->store; |
637 | STACK_OF(X509_CRL) *sk = NULL; | 623 | STACK_OF(X509_CRL) *sk = NULL; |
@@ -679,11 +665,7 @@ X509_STORE_get1_crls(X509_STORE_CTX *ctx, X509_NAME *name) | |||
679 | sk_X509_CRL_pop_free(sk, X509_CRL_free); | 665 | sk_X509_CRL_pop_free(sk, X509_CRL_free); |
680 | return NULL; | 666 | return NULL; |
681 | } | 667 | } |
682 | #if defined(LIBRESSL_NEXT_API) | ||
683 | LCRYPTO_ALIAS(X509_STORE_CTX_get1_crls); | 668 | LCRYPTO_ALIAS(X509_STORE_CTX_get1_crls); |
684 | #else | ||
685 | LCRYPTO_ALIAS(X509_STORE_get1_crls); | ||
686 | #endif | ||
687 | 669 | ||
688 | X509_OBJECT * | 670 | X509_OBJECT * |
689 | X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x) | 671 | X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x) |