From c7d371256a1f6f0a60d62f70d1bca2a45867e22e Mon Sep 17 00:00:00 2001
From: andreaP <andrea.peruffo@unicredit.eu>
Date: Mon, 15 Dec 2014 14:43:44 +0100
Subject: add aes ecb to crypto library

---
 lib/crypto/c_src/crypto.c | 34 ++++++++++++++++++++++++++++++++++
 lib/crypto/src/crypto.erl | 20 ++++++++++++++++++++
 2 files changed, 54 insertions(+)

(limited to 'lib/crypto')

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 750f3db7ef..f9317d7a00 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -242,6 +242,7 @@ static ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM aes_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -379,6 +380,7 @@ static ErlNifFunc nif_funcs[] = {
     {"aes_ctr_decrypt", 3, aes_ctr_encrypt},
     {"aes_ctr_stream_encrypt", 2, aes_ctr_stream_encrypt},
     {"aes_ctr_stream_decrypt", 2, aes_ctr_stream_encrypt},
+    {"aes_ecb_crypt", 3, aes_ecb_crypt},
     {"rand_bytes", 1, rand_bytes_1},
     {"strong_rand_bytes_nif", 1, strong_rand_bytes_nif},
     {"rand_bytes", 3, rand_bytes_3},
@@ -2032,6 +2034,38 @@ static ERL_NIF_TERM chacha20_poly1305_decrypt(ErlNifEnv* env, int argc, const ER
 #endif
 }
 
+static ERL_NIF_TERM aes_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, Data, IsEncrypt) */    
+    ErlNifBinary key_bin, data_bin;
+    AES_KEY aes_key;
+    int i;
+    unsigned char* ret_ptr;
+    ERL_NIF_TERM ret;    
+
+    CHECK_OSE_CRYPTO();
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
+    || (key_bin.size != 16 && key_bin.size != 32)
+    || !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)
+    || data_bin.size % 16 != 0) {
+    return enif_make_badarg(env);
+    }
+
+    if (argv[2] == atom_true) {
+        i = AES_ENCRYPT;
+        AES_set_encrypt_key(key_bin.data, key_bin.size*8, &aes_key);
+    }
+    else {
+        i = AES_DECRYPT;
+        AES_set_decrypt_key(key_bin.data, key_bin.size*8, &aes_key);
+    }
+
+    ret_ptr = enif_make_new_binary(env, data_bin.size, &ret);
+    AES_ecb_encrypt(data_bin.data, ret_ptr, &aes_key, i);
+    CONSUME_REDS(env,data_bin);
+    return ret;
+}
+
 static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Bytes) */     
     unsigned bytes;
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 7f82fa83fd..ed8953fa62 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -154,6 +154,10 @@
 -deprecated({aes_ctr_decrypt, 3, next_major_release}).
 -deprecated({rc4_encrypt, 2, next_major_release}).
 
+%aes enc/dec
+-export([aes_ecb_crypt/3,aes_ecb_encrypt/2,aes_ecb_decrypt/2]).
+-deprecated({aes_ecb_crypt, 3}).
+
 %% Replace by public/private_encrypt/decrypt
 -export([rsa_public_encrypt/3, rsa_private_decrypt/3]).
 -export([rsa_private_encrypt/3, rsa_public_decrypt/3]).
@@ -1392,6 +1396,21 @@ do_stream_decrypt({rc4, State0}, Data) ->
 aes_ctr_encrypt(_Key, _IVec, _Data) -> ?nif_stub.
 aes_ctr_decrypt(_Key, _IVec, _Cipher) -> ?nif_stub.
 
+%%
+%% AES - in electronic codebook mode (ECB)
+%%
+-spec aes_ecb_crypt(iodata(), iodata(), integer()) ->
+                 binary().
+
+aes_ecb_encrypt(Key, Data) ->
+    aes_ecb_crypt(Key, Data, true).
+
+aes_ecb_decrypt(Key, Data) ->
+    aes_ecb_crypt(Key, Data, false).
+
+aes_ecb_crypt(_Key, __Data, _IsEncrypt) -> ?nif_stub.
+
+
 %%
 %% AES - in counter mode (CTR) with state maintained for multi-call streaming 
 %%
@@ -1850,6 +1869,7 @@ mod_exp_nif(_Base,_Exp,_Mod,_bin_hdr) -> ?nif_stub.
 		    aes_ctr_encrypt, aes_ctr_decrypt,
                     aes_ctr_stream_init, aes_ctr_stream_encrypt, aes_ctr_stream_decrypt,
 		    %%
+            aes_ecb_encrypt, aes_decrypt,
 		    next_iv,
 		    %% deprecated
 		    aes_cbc_ivec,
-- 
cgit v1.2.3