aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/c_src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-12-17 15:44:33 +0100
committerSverker Eriksson <[email protected]>2015-12-17 15:44:33 +0100
commit82be6a3e5589781551ca9170cb212983463f1446 (patch)
treea20ab632829309aa291b72250d5bc7ddd5afd42e /lib/crypto/c_src
parent0eb8ad3ef943238d0eaeefa872b8dd766e4524c3 (diff)
parent32eb9d7d9f680d320f42186de67db65688cdd53f (diff)
downloadotp-82be6a3e5589781551ca9170cb212983463f1446.tar.gz
otp-82be6a3e5589781551ca9170cb212983463f1446.tar.bz2
otp-82be6a3e5589781551ca9170cb212983463f1446.zip
Merge branch 'sverk/crypto/aes-cbc-192-bit'
OTP-13206 * sverk/crypto/aes-cbc-192-bit: crypto: Support 192-bit keys for AES CBC
Diffstat (limited to 'lib/crypto/c_src')
-rw-r--r--lib/crypto/c_src/crypto.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 6a41385296..406dde91ba 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -447,6 +447,9 @@ struct cipher_type_t cipher_types[] =
{"blowfish_cfb64", &EVP_bf_cfb64},
{"blowfish_ofb64", &EVP_bf_ofb},
{"blowfish_ecb", &EVP_bf_ecb},
+ {"aes_cbc", &EVP_aes_128_cbc, 16},
+ {"aes_cbc", &EVP_aes_192_cbc, 24},
+ {"aes_cbc", &EVP_aes_256_cbc, 32},
{"aes_cbc128", &EVP_aes_128_cbc},
{"aes_cbc256", &EVP_aes_256_cbc},
{"aes_cfb8", &EVP_aes_128_cfb8},
@@ -757,6 +760,7 @@ static void init_algorithms_types(ErlNifEnv* env)
#ifdef HAVE_DES_ede3_cfb_encrypt
algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des3_cbf");
#endif
+ algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc");
algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc128");
algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cfb8");
algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cfb128");