diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-08-26 17:05:08 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-08-26 17:05:08 +1000 |
| commit | 4a42e2640499ce46d2733c4316c5fe4594a37c54 (patch) | |
| tree | fe7235c50a838af626b46199beed5f85cb4e8b94 /providers/default/defltprov.c | |
| parent | 37a830e729f56cfc7b893f321880ac52f1b35cdb (diff) | |
Cleanup ciphers and Add 3des ciphers.
Moved the relevant ciphers into default and restructed headers to allow the move.
This removed most of the cases of #ifdef NO_XXX (which are now specified in build.info)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9482)
Diffstat (limited to 'providers/default/defltprov.c')
| -rw-r--r-- | providers/default/defltprov.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c index 5664fbe3b2..2498d068df 100644 --- a/providers/default/defltprov.c +++ b/providers/default/defltprov.c @@ -173,6 +173,18 @@ static const OSSL_ALGORITHM deflt_ciphers[] = { { "CAMELLIA-192-CTR", "default=yes", camellia192ctr_functions }, { "CAMELLIA-128-CTR", "default=yes", camellia128ctr_functions }, #endif /* OPENSSL_NO_CAMELLIA */ + { "DES-EDE3", "default=yes", tdes_ede3_ecb_functions }, + { "DES-EDE3-CBC", "default=yes", tdes_ede3_cbc_functions }, + { "DES-EDE3-OFB", "default=yes", tdes_ede3_ofb_functions }, + { "DES-EDE3-CFB", "default=yes", tdes_ede3_cfb_functions }, + { "DES-EDE3-CFB8", "default=yes", tdes_ede3_cfb8_functions }, + { "DES-EDE3-CFB1", "default=yes", tdes_ede3_cfb1_functions }, + { "DES-EDE", "default=yes", tdes_ede2_ecb_functions }, + { "DES-EDE-CBC", "default=yes", tdes_ede2_cbc_functions }, + { "DES-EDE-OFB", "default=yes", tdes_ede2_ofb_functions }, + { "DES-EDE-CFB", "default=yes", tdes_ede2_cfb_functions }, + { "DESX-CBC", "default=yes", tdes_desx_cbc_functions }, + { "id-smime-alg-CMS3DESwrap", "default=yes", tdes_wrap_cbc_functions }, { NULL, NULL, NULL } }; |