File 1635-crypto-Remove-seemingly-unused-low-level-A... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1635-crypto-Remove-seemingly-unused-low-level-API-aes_cfb.patch of Package erlang (Revision e62e4225e41cf032f11f17868c8e4330)

Currently displaying revision e62e4225e41cf032f11f17868c8e4330 , Show latest

From a65f2fd46fa29c7a3ac940c7608ea8756f97805d Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 7 May 2020 10:05:57 +0200
Subject: [PATCH 05/17] crypto: Remove seemingly unused low-level API
 aes_cfb_(8|128)_crypt NIFs

---
 lib/crypto/c_src/aes.c | 86 ------------------------------------------
 lib/crypto/c_src/aes.h |  3 --
 2 files changed, 89 deletions(-)

diff --git a/lib/crypto/c_src/aes.c b/lib/crypto/c_src/aes.c
index e3a7c52a2c..feec52d935 100644
--- a/lib/crypto/c_src/aes.c
+++ b/lib/crypto/c_src/aes.c
@@ -21,92 +21,6 @@
 #include "aes.h"
 #include "cipher.h"
 
-ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */
-     ErlNifBinary key, ivec, text;
-     AES_KEY aes_key;
-     unsigned char ivec_clone[16]; /* writable copy */
-     int new_ivlen = 0;
-     ERL_NIF_TERM ret;
-     unsigned char *outp;
-
-     CHECK_NO_FIPS_MODE();
-
-     ASSERT(argc == 4);
-
-     if (!enif_inspect_iolist_as_binary(env, argv[0], &key))
-         goto bad_arg;
-     if (key.size != 16 && key.size != 24 && key.size != 32)
-         goto bad_arg;
-     if (!enif_inspect_binary(env, argv[1], &ivec))
-         goto bad_arg;
-     if (ivec.size != 16)
-         goto bad_arg;
-     if (!enif_inspect_iolist_as_binary(env, argv[2], &text))
-         goto bad_arg;
-
-     memcpy(ivec_clone, ivec.data, 16);
-
-     /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
-     if (AES_set_encrypt_key(key.data, (int)key.size * 8, &aes_key) != 0)
-         goto err;
-     if ((outp = enif_make_new_binary(env, text.size, &ret)) == NULL)
-         goto err;
-     AES_cfb8_encrypt((unsigned char *) text.data,
-                      outp,
-                      text.size, &aes_key, ivec_clone, &new_ivlen,
-                      (argv[3] == atom_true));
-     CONSUME_REDS(env,text);
-     return ret;
-
- bad_arg:
- err:
-     return enif_make_badarg(env);
-}
-
-ERL_NIF_TERM aes_cfb_128_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */
-    ErlNifBinary key, ivec, text;
-    AES_KEY aes_key;
-    unsigned char ivec_clone[16]; /* writable copy */
-    int new_ivlen = 0;
-    ERL_NIF_TERM ret;
-    unsigned char *outp;
-
-    ASSERT(argc == 4);
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key))
-        goto bad_arg;
-    if (key.size != 16 && key.size != 24 && key.size != 32)
-        goto bad_arg;
-    if (!enif_inspect_binary(env, argv[1], &ivec))
-        goto bad_arg;
-    if (ivec.size != 16)
-        goto bad_arg;
-    if (!enif_inspect_iolist_as_binary(env, argv[2], &text))
-        goto bad_arg;
-
-    memcpy(ivec_clone, ivec.data, 16);
-
-    /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
-    if (AES_set_encrypt_key(key.data, (int)key.size * 8, &aes_key) != 0)
-        goto err;
-
-    if ((outp = enif_make_new_binary(env, text.size, &ret)) == NULL)
-        goto err;
-    AES_cfb128_encrypt((unsigned char *) text.data,
-                       outp,
-                       text.size, &aes_key, ivec_clone, &new_ivlen,
-                       (argv[3] == atom_true));
-    CONSUME_REDS(env,text);
-    return ret;
-
- bad_arg:
- err:
-    return enif_make_badarg(env);
-}
-
-
 #if !defined(HAVE_EVP_AES_CTR)
 ERL_NIF_TERM aes_ctr_stream_encrypt_compat(ErlNifEnv* env, const ERL_NIF_TERM state_arg, const ERL_NIF_TERM data_arg)
 {/* ({Key, IVec, ECount, Num}, Data) */
diff --git a/lib/crypto/c_src/aes.h b/lib/crypto/c_src/aes.h
index 28a86d891e..f617a7df8f 100644
--- a/lib/crypto/c_src/aes.h
+++ b/lib/crypto/c_src/aes.h
@@ -23,9 +23,6 @@
 
 #include "common.h"
 
-ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-ERL_NIF_TERM aes_cfb_128_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-
 #if !defined(HAVE_EVP_AES_CTR)
 ERL_NIF_TERM aes_ctr_stream_encrypt_compat(ErlNifEnv* env, const ERL_NIF_TERM state_arg, const ERL_NIF_TERM data_arg);
 #endif
-- 
2.31.1

Places

File 1635-crypto-Remove-seemingly-unused-low-level-API-aes_cfb.patch of Package erlang (Revision e62e4225e41cf032f11f17868c8e4330)

Places