aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-05-18 13:06:48 +0200
committerGitHub <[email protected]>2017-05-18 13:06:48 +0200
commitd7a0c388e8f591b479df2e965ef6f8055cab7971 (patch)
tree4d34cd19da366f7a24df89b0a3ff5608941d72ef
parent91da20e4cc10a1b73672e558be34b14adc8ac0ae (diff)
parent76b7ae173b745d025fa2b6ec206670ee92d491c2 (diff)
downloadotp-d7a0c388e8f591b479df2e965ef6f8055cab7971.tar.gz
otp-d7a0c388e8f591b479df2e965ef6f8055cab7971.tar.bz2
otp-d7a0c388e8f591b479df2e965ef6f8055cab7971.zip
Merge pull request #1446 from hairyhum/crypto-duplicate-aes_gcm
Remove duplicate aes_gcm from a list of ciphers
-rw-r--r--lib/crypto/c_src/crypto.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 3f0439ed80..793cff166c 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -1089,9 +1089,6 @@ static void init_algorithms_types(ErlNifEnv* env)
#ifndef OPENSSL_NO_RC4
algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"rc4");
#endif
-#if defined(HAVE_GCM)
- algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"aes_gcm");
-#endif
#if defined(HAVE_CHACHA20_POLY1305)
algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"chacha20_poly1305");
#endif