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 /crypto | |
| 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 'crypto')
| -rw-r--r-- | crypto/evp/evp_enc.c | 6 | ||||
| -rw-r--r-- | crypto/include/internal/ciphermode_platform.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index ce1136116c..8290494cb0 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -239,6 +239,12 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, case NID_des_ede_ofb64: case NID_des_ede_cfb64: case NID_desx_cbc: + case NID_des_cbc: + case NID_des_ecb: + case NID_des_cfb1: + case NID_des_cfb8: + case NID_des_cfb64: + case NID_des_ofb64: case NID_id_smime_alg_CMS3DESwrap: case NID_bf_cbc: case NID_bf_ecb: diff --git a/crypto/include/internal/ciphermode_platform.h b/crypto/include/internal/ciphermode_platform.h index a99ce0d495..b16062fa93 100644 --- a/crypto/include/internal/ciphermode_platform.h +++ b/crypto/include/internal/ciphermode_platform.h @@ -296,6 +296,10 @@ void des_t4_ede3_cbc_encrypt(const void *inp, void *out, size_t len, const DES_key_schedule ks[3], unsigned char iv[8]); void des_t4_ede3_cbc_decrypt(const void *inp, void *out, size_t len, const DES_key_schedule ks[3], unsigned char iv[8]); +void des_t4_cbc_encrypt(const void *inp, void *out, size_t len, + const DES_key_schedule *ks, unsigned char iv[8]); +void des_t4_cbc_decrypt(const void *inp, void *out, size_t len, + const DES_key_schedule *ks, unsigned char iv[8]); # endif /* OPENSSL_NO_DES */ # elif defined(OPENSSL_CPUID_OBJ) && defined(__s390__) |