summaryrefslogtreecommitdiffstats
path: root/providers/defltprov.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-01-08 16:16:22 +0000
committerMatt Caswell <matt@openssl.org>2020-01-20 15:28:39 +0000
commit068489a27f74c5f5a779aef4618e68e46db746d4 (patch)
tree2649e390c4689b560c912ba67b7587d88a331ae1 /providers/defltprov.c
parent993ebac9ed38481e4d3795c437d4e98b985c68ce (diff)
Implement the NULL cipher in the default provider
Libssl uses the null cipher in certain situations. It should be converted to a provided cipher. Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10865)
Diffstat (limited to 'providers/defltprov.c')
-rw-r--r--providers/defltprov.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c
index 3220bc5220..166281fae3 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -138,6 +138,7 @@ static const OSSL_ALGORITHM deflt_digests[] = {
};
static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = {
+ ALG("NULL", null_functions),
ALG("AES-256-ECB", aes256ecb_functions),
ALG("AES-192-ECB", aes192ecb_functions),
ALG("AES-128-ECB", aes128ecb_functions),