crypto: Remove block.c and block.h

Replaced by api_ng.c

4 files changed, 0 insertions, 181 deletions

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index e1e7f71538..89de220e7b 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -77,7 +77,6 @@ CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
 	$(OBJDIR)/algorithms$(TYPEMARKER).o \
 	$(OBJDIR)/api_ng$(TYPEMARKER).o \
 	$(OBJDIR)/atoms$(TYPEMARKER).o \
-	$(OBJDIR)/block$(TYPEMARKER).o \
 	$(OBJDIR)/bn$(TYPEMARKER).o \
 	$(OBJDIR)/chacha20$(TYPEMARKER).o \
 	$(OBJDIR)/cipher$(TYPEMARKER).o \
diff --git a/lib/crypto/c_src/block.c b/lib/crypto/c_src/block.c
deleted file mode 100644
index 0a4fd72623..0000000000
--- a/lib/crypto/c_src/block.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2010-2018. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * %CopyrightEnd%
- */
-
-#include "block.h"
-#include "aes.h"
-#include "cipher.h"
-
-ERL_NIF_TERM block_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Key, Ivec, Text, IsEncrypt) or (Type, Key, Text, IsEncrypt) */
-    const struct cipher_type_t *cipherp;
-    const EVP_CIPHER     *cipher;
-    ErlNifBinary         key, ivec, text;
-    EVP_CIPHER_CTX       *ctx = NULL;
-    ERL_NIF_TERM         ret;
-    unsigned char        *out;
-    int                  ivec_size, out_size = 0;
-    int                  cipher_len;
-
-    ASSERT(argc == 4 || argc == 5);
-
-    if (!enif_inspect_iolist_as_binary(env, argv[1], &key))
-        goto bad_arg;
-    if (key.size > INT_MAX)
-        goto bad_arg;
-    if ((cipherp = get_cipher_type(argv[0], key.size)) == NULL)
-        goto bad_arg;
-    if (cipherp->flags & (NON_EVP_CIPHER | AEAD_CIPHER))
-        goto bad_arg;
-    if (!enif_inspect_iolist_as_binary(env, argv[argc - 2], &text))
-        goto bad_arg;
-    if (text.size > INT_MAX)
-        goto bad_arg;
-
-    if (FORBIDDEN_IN_FIPS(cipherp))
-        return enif_raise_exception(env, atom_notsup);
-    if ((cipher = cipherp->cipher.p) == NULL)
-        return enif_raise_exception(env, atom_notsup);
-
-    if (cipherp->flags & AES_CFBx) {
-        if (argv[0] == atom_aes_cfb8
-            && (key.size == 24 || key.size == 32)) {
-            /* Why do EVP_CIPHER_CTX_set_key_length() fail on these key sizes?
-             * Fall back on low level API
-             */
-            return aes_cfb_8_crypt(env, argc-1, argv+1);
-        }
-        else if (argv[0] == atom_aes_cfb128
-                 && (key.size == 24 || key.size == 32)) {
-            /* Why do EVP_CIPHER_CTX_set_key_length() fail on these key sizes?
-             * Fall back on low level API
-             */
-            return aes_cfb_128_crypt_nif(env, argc-1, argv+1);
-        }
-    }
-
-    ivec_size  = EVP_CIPHER_iv_length(cipher);
-
-#ifdef HAVE_ECB_IVEC_BUG
-    if (cipherp->flags & ECB_BUG_0_9_8L)
-        ivec_size = 0; /* 0.9.8l returns faulty ivec_size */
-#endif
-
-    if (ivec_size < 0)
-        goto bad_arg;
-
-    if ((cipher_len = EVP_CIPHER_block_size(cipher)) < 0)
-        goto bad_arg;
-    if (text.size % (size_t)cipher_len != 0)
-        goto bad_arg;
-
-    if (ivec_size == 0) {
-        if (argc != 4)
-            goto bad_arg;
-    } else {
-        if (argc != 5)
-            goto bad_arg;
-        if (!enif_inspect_iolist_as_binary(env, argv[2], &ivec))
-            goto bad_arg;
-        if (ivec.size != (size_t)ivec_size)
-            goto bad_arg;
-    }
-
-    if ((out = enif_make_new_binary(env, text.size, &ret)) == NULL)
-        goto err;
-    if ((ctx = EVP_CIPHER_CTX_new()) == NULL)
-        goto err;
-
-    if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL,
-                           (argv[argc - 1] == atom_true)))
-        goto err;
-    if (!EVP_CIPHER_CTX_set_key_length(ctx, (int)key.size))
-        goto err;
-
-    if (EVP_CIPHER_type(cipher) == NID_rc2_cbc) {
-        if (key.size > INT_MAX / 8)
-            goto err;
-        if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, (int)key.size * 8, NULL))
-            goto err;
-    }
-
-    if (!EVP_CipherInit_ex(ctx, NULL, NULL, key.data,
-                           ivec_size ? ivec.data : NULL, -1))
-        goto err;
-    if (!EVP_CIPHER_CTX_set_padding(ctx, 0))
-        goto err;
-
-    /* OpenSSL 0.9.8h asserts text.size > 0 */
-    if (text.size > 0) {
-        if (!EVP_CipherUpdate(ctx, out, &out_size, text.data, (int)text.size))
-            goto err;
-        if (ASSERT(out_size == text.size), 0)
-            goto err;
-        if (!EVP_CipherFinal_ex(ctx, out + out_size, &out_size))
-            goto err;
-    }
-
-    ASSERT(out_size == 0);
-    CONSUME_REDS(env, text);
-    goto done;
-
- bad_arg:
-    ret = enif_make_badarg(env);
-    goto done;
-
- err:
-    ret = enif_raise_exception(env, atom_notsup);
-
- done:
-    if (ctx)
-        EVP_CIPHER_CTX_free(ctx);
-    return ret;
-}
diff --git a/lib/crypto/c_src/block.h b/lib/crypto/c_src/block.h
deleted file mode 100644
index cc5e78ce12..0000000000
--- a/lib/crypto/c_src/block.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2010-2018. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * %CopyrightEnd%
- */
-
-#ifndef E_BLOCK_H__
-#define E_BLOCK_H__ 1
-
-#include "common.h"
-
-ERL_NIF_TERM block_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-
-#endif /* E_BLOCK_H__ */
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index c6a5dde67f..ac9823887a 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -29,7 +29,6 @@
 #include "aes.h"
 #include "algorithms.h"
 #include "api_ng.h"
-#include "block.h"
 #include "bn.h"
 #include "chacha20.h"
 #include "cipher.h"
@@ -80,8 +79,6 @@ static ErlNifFunc nif_funcs[] = {
     {"hmac_final_nif", 2, hmac_final_nif, 0},
     {"cmac_nif", 3, cmac_nif, 0},
     {"cipher_info_nif", 1, cipher_info_nif, 0},
-    {"block_crypt_nif", 5, block_crypt_nif, 0},
-    {"block_crypt_nif", 4, block_crypt_nif, 0},
     {"aes_ige_crypt_nif", 4, aes_ige_crypt_nif, 0},
     {"aes_ctr_stream_init", 2, aes_ctr_stream_init, 0},
     {"aes_ctr_stream_encrypt", 2, aes_ctr_stream_encrypt, 0},