From 2e1bc081007db167d7ce4740fcc6f185f62c9881 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 9 Dec 2020 17:50:20 +0100 Subject: Remove unnecessary guards around MSBLOB and PVK readers and writers The OPENSSL_NO_RC4 guard remain around protected PVK tests in test/endecoder_test.c. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/13648) --- engines/e_loader_attic.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'engines') diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index 936faa98b3..586a21df41 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -1338,9 +1338,6 @@ static int file_read_pem(BIO *bp, char **pem_name, char **pem_header, static OSSL_STORE_INFO *file_try_read_msblob(BIO *bp, int *matchcount) { -#ifdef OPENSSL_NO_DSA - return NULL; -#else OSSL_STORE_INFO *result = NULL; int ispub = -1; @@ -1372,16 +1369,12 @@ static OSSL_STORE_INFO *file_try_read_msblob(BIO *bp, int *matchcount) } return result; -#endif } static OSSL_STORE_INFO *file_try_read_PVK(BIO *bp, const UI_METHOD *ui_method, void *ui_data, const char *uri, int *matchcount) { -#if defined(OPENSSL_NO_DSA) || defined(OPENSSL_NO_RC4) - return NULL; -#else OSSL_STORE_INFO *result = NULL; { @@ -1411,7 +1404,6 @@ static OSSL_STORE_INFO *file_try_read_PVK(BIO *bp, const UI_METHOD *ui_method, } return result; -#endif } static int file_read_asn1(BIO *bp, unsigned char **data, long *len) -- cgit v1.2.3