Merge branch 'sverk/crypto-aec-ecb-multiblock' into maint

OTP-13249

* sverk/crypto-aec-ecb-multiblock:
  crypto: Fix bug for multiple blocks for AES-ECB

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 9de8dc74c2..3c73c318ed 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -2042,6 +2042,7 @@ static ERL_NIF_TERM aes_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     ErlNifBinary key_bin, data_bin;
     AES_KEY aes_key;
     int i;
+    int j;
     unsigned char* ret_ptr;
     ERL_NIF_TERM ret;    
 
@@ -2064,7 +2065,9 @@ static ERL_NIF_TERM aes_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     }
 
     ret_ptr = enif_make_new_binary(env, data_bin.size, &ret);
-    AES_ecb_encrypt(data_bin.data, ret_ptr, &aes_key, i);
+    for (j = 0; j < data_bin.size; j += 16) {
+	AES_ecb_encrypt(data_bin.data+j, ret_ptr+j, &aes_key, i);
+    }
     CONSUME_REDS(env,data_bin);
     return ret;
 }