mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only enable CRYPTO_3DES_ECB if that name is an existing macro

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2203)
This commit is contained in:
Richard Levitte 2017-01-10 09:20:07 +01:00
parent 374d543f29
commit d95743047e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/engine/eng_cryptodev.c
View File

@ -176,12 +176,20 @@ static struct {
} ciphers[] = {
{CRYPTO_ARC4, NID_rc4, 0, 16},
{CRYPTO_DES_CBC, NID_des_cbc, 8, 8},
# if !defined(CRYPTO_ALGORITHM_MIN) || defined(CRYPTO_3DES_CBC)
# if defined(CRYPTO_3DES_CBC)
{CRYPTO_3DES_CBC, NID_des_ede3_cbc, 8, 24},
# endif
# if !defined(CRYPTO_ALGORITHM_MIN) || defined(CRYPTO_3DES_ECB)
/*
* The marvell-kirkwood armv5 platform doesn't seem to have CRYPTO_3DES_ECB.
* Unfortunately, there is no way to detect this, except on BSD, where the
* crypto identities are implemented as macros. All other cryptodev
* implementations will be without this one.
*/
# if defined(CRYPTO_3DES_ECB)
{CRYPTO_3DES_ECB, NID_des_ede3_ecb, 0, 24},
# endif
{CRYPTO_AES_CBC, NID_aes_128_cbc, 16, 16},
{CRYPTO_AES_CBC, NID_aes_192_cbc, 16, 24},
{CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32},