5 files changed, 71 insertions, 3 deletions

diff --git a/lib/crypto/c_src/atoms.c b/lib/crypto/c_src/atoms.c
index 114e3c1985..0793ffa6ca 100644
--- a/lib/crypto/c_src/atoms.c
+++ b/lib/crypto/c_src/atoms.c
@@ -52,6 +52,12 @@ ERL_NIF_TERM atom_ecb_mode;
 ERL_NIF_TERM atom_cbc_mode;
 ERL_NIF_TERM atom_cfb_mode;
 ERL_NIF_TERM atom_ofb_mode;
+ERL_NIF_TERM atom_ctr_mode;
+ERL_NIF_TERM atom_gcm_mode;
+ERL_NIF_TERM atom_ccm_mode;
+ERL_NIF_TERM atom_xts_mode;
+ERL_NIF_TERM atom_wrap_mode;
+ERL_NIF_TERM atom_ocb_mode;
 ERL_NIF_TERM atom_stream_cipher;
 
 #if defined(HAVE_EC)
@@ -164,6 +170,12 @@ int init_atoms(ErlNifEnv *env, const ERL_NIF_TERM fips_mode, const ERL_NIF_TERM
     atom_cbc_mode = enif_make_atom(env,"cbc_mode");
     atom_cfb_mode = enif_make_atom(env,"cfb_mode");
     atom_ofb_mode = enif_make_atom(env,"ofb_mode");
+    atom_ctr_mode = enif_make_atom(env,"ctr_mode");
+    atom_gcm_mode = enif_make_atom(env,"gcm_mode");
+    atom_ccm_mode = enif_make_atom(env,"ccm_mode");
+    atom_xts_mode = enif_make_atom(env,"xts_mode");
+    atom_wrap_mode = enif_make_atom(env,"wrap_mode");
+    atom_ocb_mode = enif_make_atom(env,"ocb_mode");
     atom_stream_cipher = enif_make_atom(env,"stream_cipher");
 
 #if defined(HAVE_EC)
diff --git a/lib/crypto/c_src/atoms.h b/lib/crypto/c_src/atoms.h
index fc46d838aa..24f6dc26fd 100644
--- a/lib/crypto/c_src/atoms.h
+++ b/lib/crypto/c_src/atoms.h
@@ -56,6 +56,12 @@ extern ERL_NIF_TERM atom_ecb_mode;
 extern ERL_NIF_TERM atom_cbc_mode;
 extern ERL_NIF_TERM atom_cfb_mode;
 extern ERL_NIF_TERM atom_ofb_mode;
+extern ERL_NIF_TERM atom_ctr_mode;
+extern ERL_NIF_TERM atom_gcm_mode;
+extern ERL_NIF_TERM atom_ccm_mode;
+extern ERL_NIF_TERM atom_xts_mode;
+extern ERL_NIF_TERM atom_wrap_mode;
+extern ERL_NIF_TERM atom_ocb_mode;
 extern ERL_NIF_TERM atom_stream_cipher;
 
 #if defined(HAVE_EC)
diff --git a/lib/crypto/c_src/cipher.c b/lib/crypto/c_src/cipher.c
index 9d60254a3c..2652e1db4e 100644
--- a/lib/crypto/c_src/cipher.c
+++ b/lib/crypto/c_src/cipher.c
@@ -274,6 +274,42 @@ ERL_NIF_TERM cipher_info_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
             ret_mode = atom_ofb_mode;
             break;
 
+#ifdef EVP_CIPH_CTR_MODE
+        case EVP_CIPH_CTR_MODE:
+            ret_mode = atom_ctr_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_GCM_MODE
+        case EVP_CIPH_GCM_MODE:
+            ret_mode = atom_gcm_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_CCM_MODE
+        case EVP_CIPH_CCM_MODE:
+            ret_mode = atom_ccm_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_XTS_MODE
+        case EVP_CIPH_XTS_MODE:
+            ret_mode = atom_xts_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_WRAP_MODE
+        case EVP_CIPH_WRAP_MODE:
+            ret_mode = atom_wrap_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_OCB_MODE
+        case EVP_CIPH_OCB_MODE:
+            ret_mode = atom_ocb_mode;
+            break;
+#endif
+
         case EVP_CIPH_STREAM_CIPHER:
             ret_mode = atom_stream_cipher;
             break;
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 5cf34f8069..503c347c56 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -550,8 +550,20 @@ poly1305(Key, Data) ->
 -spec cipher_info(Type) -> map() when Type :: block_cipher_with_iv()
                                            | aead_cipher()
                                            | block_cipher_without_iv().
+%% These ciphers are not available via the EVP interface on older cryptolibs.
+cipher_info(aes_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 32,mode => ctr_mode,type => undefined};
+cipher_info(aes_128_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 16,mode => ctr_mode,type => undefined};
+cipher_info(aes_192_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 24,mode => ctr_mode,type => undefined};
+cipher_info(aes_256_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 32,mode => ctr_mode,type => undefined};
+%% This cipher is handled specialy.
+cipher_info(aes_ige256) ->
+    #{block_size => 16,iv_length => 32,key_length => 16,mode => ige_mode,type => undefined};
 cipher_info(Type) ->
-    cipher_info_nif(Type).
+    cipher_info_nif(alias(Type)).
 
 %%%---- Block ciphers
 %%%----------------------------------------------------------------
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 5aa19a6ae0..ce5097de47 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -847,7 +847,8 @@ cipher_info(Config) when is_list(Config) ->
     #{type := _,key_length := _,iv_length := _,
         block_size := _,mode := _} = crypto:cipher_info(aes_128_cbc),
     {'EXIT',_} = (catch crypto:cipher_info(not_a_cipher)),
-    ok.
+    lists:foreach(fun(C) -> crypto:cipher_info(C) end,
+        proplists:get_value(ciphers, crypto:supports())).
 
 %%--------------------------------------------------------------------
 hash_info() ->
@@ -855,7 +856,8 @@ hash_info() ->
 hash_info(Config) when is_list(Config) ->
     #{type := _,size := _,block_size := _} = crypto:hash_info(sha256),
     {'EXIT',_} = (catch crypto:hash_info(not_a_hash)),
-    ok.
+    lists:foreach(fun(H) -> crypto:hash_info(H) end,
+        proplists:get_value(hashs, crypto:supports())).
 
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------