diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-12-09 17:50:20 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-13 10:27:31 +0100 |
| commit | 2e1bc081007db167d7ce4740fcc6f185f62c9881 (patch) | |
| tree | b13840b220e92ae59d52c11b2d33982ff47db3b1 /engines/e_loader_attic.c | |
| parent | a158f8cfb9588634831615128a9b9d4b92204cff (diff) | |
| download | openssl-new-2e1bc081007db167d7ce4740fcc6f185f62c9881.tar.gz | |
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 <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13648)
Diffstat (limited to 'engines/e_loader_attic.c')
| -rw-r--r-- | engines/e_loader_attic.c | 8 |
1 files changed, 0 insertions, 8 deletions
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) |