diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-23 14:35:16 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-23 14:35:16 +1000 |
| commit | e3f3ee448f6c9d6765efc8739a09def8a04f0dc0 (patch) | |
| tree | a9fd41b14a0bdb9af70260f3e03e9ae0324df080 /providers/common | |
| parent | a941054ad7f5af9445896a37754ae451fad7ed98 (diff) | |
Add des ciphers to default provider
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9954)
Diffstat (limited to 'providers/common')
| -rw-r--r-- | providers/common/include/internal/provider_algs.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/providers/common/include/internal/provider_algs.h b/providers/common/include/internal/provider_algs.h index 3b0a9e4a8e..bca972d97a 100644 --- a/providers/common/include/internal/provider_algs.h +++ b/providers/common/include/internal/provider_algs.h @@ -160,10 +160,10 @@ extern const OSSL_DISPATCH sm4128ofb128_functions[]; extern const OSSL_DISPATCH sm4128cfb128_functions[]; #endif /* OPENSSL_NO_SM4 */ +#ifndef OPENSSL_NO_DES extern const OSSL_DISPATCH tdes_ede3_ecb_functions[]; extern const OSSL_DISPATCH tdes_ede3_cbc_functions[]; - -#ifndef FIPS_MODE +# ifndef FIPS_MODE extern const OSSL_DISPATCH tdes_ede3_ofb_functions[]; extern const OSSL_DISPATCH tdes_ede3_cfb_functions[]; extern const OSSL_DISPATCH tdes_ede3_cfb8_functions[]; @@ -176,7 +176,15 @@ extern const OSSL_DISPATCH tdes_ede2_cfb_functions[]; extern const OSSL_DISPATCH tdes_desx_cbc_functions[]; extern const OSSL_DISPATCH tdes_wrap_cbc_functions[]; -#endif /* FIPS_MODE */ + +extern const OSSL_DISPATCH des_ecb_functions[]; +extern const OSSL_DISPATCH des_cbc_functions[]; +extern const OSSL_DISPATCH des_ofb64_functions[]; +extern const OSSL_DISPATCH des_cfb64_functions[]; +extern const OSSL_DISPATCH des_cfb1_functions[]; +extern const OSSL_DISPATCH des_cfb8_functions[]; +# endif /* FIPS_MODE */ +#endif /* OPENSSL_NO_DES */ /* MACs */ extern const OSSL_DISPATCH blake2bmac_functions[]; |