wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use CRYPTO_AES_CTR if it isn't defined.

Browse source 
(cherry picked from commit 6ecbc2bb62)
This commit is contained in:
Dr. Stephen Henson 2014-02-18 22:20:30 +00:00
parent 3ecce3dbeb
commit 612566e752
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crypto/engine/eng_cryptodev.c
View file

@ -147,9 +147,11 @@ static struct {
{ CRYPTO_AES_CBC, NID_aes_128_cbc, 16, 16, }, { CRYPTO_AES_CBC, NID_aes_128_cbc, 16, 16, },
{ CRYPTO_AES_CBC, NID_aes_192_cbc, 16, 24, }, { CRYPTO_AES_CBC, NID_aes_192_cbc, 16, 24, },
{ CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, }, { CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, },
#ifdef CRYPTO_AES_CTR
{ CRYPTO_AES_CTR, NID_aes_128_ctr, 14, 16, }, { CRYPTO_AES_CTR, NID_aes_128_ctr, 14, 16, },
{ CRYPTO_AES_CTR, NID_aes_192_ctr, 14, 24, }, { CRYPTO_AES_CTR, NID_aes_192_ctr, 14, 24, },
{ CRYPTO_AES_CTR, NID_aes_256_ctr, 14, 32, }, { CRYPTO_AES_CTR, NID_aes_256_ctr, 14, 32, },
#endif
{ CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, }, { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, },
{ CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, }, { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, },
{ CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, }, { CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, },
@ -602,7 +604,7 @@ const EVP_CIPHER cryptodev_aes_256_cbc = {
EVP_CIPHER_get_asn1_iv, EVP_CIPHER_get_asn1_iv,
NULL NULL
}; };
#ifdef CRYPTO_AES_CTR
const EVP_CIPHER cryptodev_aes_ctr = { const EVP_CIPHER cryptodev_aes_ctr = {
NID_aes_128_ctr, NID_aes_128_ctr,
16, 16, 14, 16, 16, 14,
@ -641,7 +643,7 @@ const EVP_CIPHER cryptodev_aes_ctr_256 = {
EVP_CIPHER_get_asn1_iv, EVP_CIPHER_get_asn1_iv,
NULL NULL
}; };
#endif
/* /*
* Registered by the ENGINE when used to find out how to deal with * Registered by the ENGINE when used to find out how to deal with
* a particular NID in the ENGINE. this says what we'll do at the * a particular NID in the ENGINE. this says what we'll do at the
@ -679,6 +681,7 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
case NID_aes_256_cbc: case NID_aes_256_cbc:
*cipher = &cryptodev_aes_256_cbc; *cipher = &cryptodev_aes_256_cbc;
break; break;
#ifdef CRYPTO_AES_CTR
case NID_aes_128_ctr: case NID_aes_128_ctr:
*cipher = &cryptodev_aes_ctr; *cipher = &cryptodev_aes_ctr;
break; break;
@ -688,6 +691,7 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
case NID_aes_256_ctr: case NID_aes_256_ctr:
*cipher = &cryptodev_aes_ctr_256; *cipher = &cryptodev_aes_ctr_256;
break; break;
#endif
default: default:
*cipher = NULL; *cipher = NULL;
break; break;