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 /providers/decoders.inc | |
| parent | a158f8cfb9588634831615128a9b9d4b92204cff (diff) | |
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 'providers/decoders.inc')
| -rw-r--r-- | providers/decoders.inc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/providers/decoders.inc b/providers/decoders.inc index a9119cad79..c9f0dea638 100644 --- a/providers/decoders.inc +++ b/providers/decoders.inc @@ -50,9 +50,7 @@ DECODER_w_structure("DSA", der, SubjectPublicKeyInfo, dsa, yes), DECODER_w_structure("DSA", der, type_specific, dsa, yes), DECODER_w_structure("DSA", der, DSA, dsa, yes), DECODER("DSA", msblob, dsa, yes), -# ifndef OPENSSL_NO_RC4 DECODER("DSA", pvk, dsa, yes), -# endif #endif #ifndef OPENSSL_NO_EC DECODER_w_structure("EC", der, PKCS8, ec, yes), @@ -74,11 +72,7 @@ DECODER_w_structure("RSA", der, type_specific_keypair, rsa, yes), DECODER_w_structure("RSA", der, RSA, rsa, yes), DECODER_w_structure("RSA-PSS", der, PKCS8, rsapss, yes), DECODER_w_structure("RSA-PSS", der, SubjectPublicKeyInfo, rsapss, yes), -#ifndef OPENSSL_NO_DSA DECODER("RSA", msblob, rsa, yes), -# ifndef OPENSSL_NO_RC4 DECODER("RSA", pvk, rsa, yes), -# endif -#endif DECODER("DER", pem, der, yes), |