diff options
| author | Emilia Kasper <emilia@openssl.org> | 2015-10-14 18:32:38 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2015-10-14 18:45:33 +0200 |
| commit | 6f73d28c20459034bfd4090494be9fb1a479c8af (patch) | |
| tree | f9d4fe0b15aaa835241f6a9039e48ed42f348f58 /crypto | |
| parent | b84939cc96896a5a9a8f5181794e53dce9b5d229 (diff) | |
Remove EVP_CHECK_DES_KEY
Thanks to the OpenBSD community for bringing this to our attention.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/e_des.c | 5 | ||||
| -rw-r--r-- | crypto/evp/e_des3.c | 13 |
2 files changed, 0 insertions, 18 deletions
diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c index 0506973b14..74e87e89a2 100644 --- a/crypto/evp/e_des.c +++ b/crypto/evp/e_des.c @@ -241,12 +241,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, } } # endif -# ifdef EVP_CHECK_DES_KEY - if (DES_set_key_checked(deskey, dat->ks.ks) != 0) - return 0; -# else DES_set_key_unchecked(deskey, ctx->cipher_data); -# endif return 1; } diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index db36634074..c113a1701c 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -269,14 +269,8 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, } } # endif -# ifdef EVP_CHECK_DES_KEY - if (DES_set_key_checked(&deskey[0], &dat->ks1) - || DES_set_key_checked(&deskey[1], &dat->ks2)) - return 0; -# else DES_set_key_unchecked(&deskey[0], &dat->ks1); DES_set_key_unchecked(&deskey[1], &dat->ks2); -# endif memcpy(&dat->ks3, &dat->ks1, sizeof(dat->ks1)); return 1; } @@ -302,16 +296,9 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, } } # endif -# ifdef EVP_CHECK_DES_KEY - if (DES_set_key_checked(&deskey[0], &dat->ks1) - || DES_set_key_checked(&deskey[1], &dat->ks2) - || DES_set_key_checked(&deskey[2], &dat->ks3)) - return 0; -# else DES_set_key_unchecked(&deskey[0], &dat->ks1); DES_set_key_unchecked(&deskey[1], &dat->ks2); DES_set_key_unchecked(&deskey[2], &dat->ks3); -# endif return 1; } |