Merge branch 'hans/crypto/supports_macs/OTP-14504' into maint

3 files changed, 24 insertions, 5 deletions

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 688ec339aa..8cb9ec1e87 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -1010,6 +1010,8 @@ static int algo_pubkey_cnt, algo_pubkey_fips_cnt;
 static ERL_NIF_TERM algo_pubkey[7]; /* increase when extending the list */
 static int algo_cipher_cnt, algo_cipher_fips_cnt;
 static ERL_NIF_TERM algo_cipher[24]; /* increase when extending the list */
+static int algo_mac_cnt, algo_mac_fips_cnt;
+static ERL_NIF_TERM algo_mac[2]; /* increase when extending the list */
 
 static void init_algorithms_types(ErlNifEnv* env)
 {
@@ -1093,9 +1095,19 @@ static void init_algorithms_types(ErlNifEnv* env)
     algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"chacha20_poly1305");
 #endif
 
+    // Validated algorithms first
+    algo_mac_cnt = 0;
+    algo_mac[algo_mac_cnt++] = enif_make_atom(env,"hmac");
+#ifdef HAVE_CMAC
+    algo_mac[algo_mac_cnt++] = enif_make_atom(env,"cmac");
+#endif
+    // Non-validated algorithms follow
+    algo_mac_fips_cnt = algo_mac_cnt;
+
     ASSERT(algo_hash_cnt <= sizeof(algo_hash)/sizeof(ERL_NIF_TERM));
     ASSERT(algo_pubkey_cnt <= sizeof(algo_pubkey)/sizeof(ERL_NIF_TERM));
     ASSERT(algo_cipher_cnt <= sizeof(algo_cipher)/sizeof(ERL_NIF_TERM));
+    ASSERT(algo_mac_cnt <= sizeof(algo_mac)/sizeof(ERL_NIF_TERM));
 }
 
 static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -1105,15 +1117,19 @@ static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     int hash_cnt   = fips_mode ? algo_hash_fips_cnt   : algo_hash_cnt;
     int pubkey_cnt = fips_mode ? algo_pubkey_fips_cnt : algo_pubkey_cnt;
     int cipher_cnt = fips_mode ? algo_cipher_fips_cnt : algo_cipher_cnt;
+    int mac_cnt    = fips_mode ? algo_mac_fips_cnt    : algo_mac_cnt;
 #else
     int hash_cnt   = algo_hash_cnt;
     int pubkey_cnt = algo_pubkey_cnt;
     int cipher_cnt = algo_cipher_cnt;
+    int mac_cnt    = algo_mac_cnt;
 #endif
-    return enif_make_tuple3(env,
+    return enif_make_tuple4(env,
 			    enif_make_list_from_array(env, algo_hash,   hash_cnt),
 			    enif_make_list_from_array(env, algo_pubkey, pubkey_cnt),
-			    enif_make_list_from_array(env, algo_cipher, cipher_cnt));
+			    enif_make_list_from_array(env, algo_cipher, cipher_cnt),
+			    enif_make_list_from_array(env, algo_mac,    mac_cnt)
+                            );
 }
 
 static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 89ef529c5d..ecc33aafc3 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -165,6 +165,7 @@
      <code> cipher_algorithms() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ctr | aes_gcm |
      aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20_poly1305 | des_cbc | des_cfb |
      des3_cbc | des3_cfb | des_ede3 | rc2_cbc | rc4 </code>
+     <code> mac_algorithms() =   hmac | cmac</code>
      <code> public_key_algorithms() =   rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code>
      <p>Note that ec_gf2m is not strictly a public key algorithm, but a restriction on what curves are supported
      with ecdsa and ecdh.
@@ -835,7 +836,8 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
       <type>
       <v> AlgorithmList =  [{hashs, [hash_algorithms()]},
                             {ciphers, [cipher_algorithms()]},
-			    {public_keys, [public_key_algorithms()]}
+			    {public_keys, [public_key_algorithms()]},
+			    {macs, [mac_algorithms()]}]
       </v>
       </type>
       <desc>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index d111525214..85206ce9e5 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -87,11 +87,12 @@ stop() ->
     application:stop(crypto).
 
 supports()->
-    {Hashs, PubKeys, Ciphers} = algorithms(),
+    {Hashs, PubKeys, Ciphers, Macs} = algorithms(),
 
     [{hashs, Hashs},
      {ciphers, Ciphers},
-     {public_keys, PubKeys}
+     {public_keys, PubKeys},
+     {macs, Macs}
     ].
 
 info_lib() -> ?nif_stub.