aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorDoug Hogan <[email protected]>2019-01-08 00:19:31 -0800
committerDoug Hogan <[email protected]>2019-01-08 01:11:58 -0800
commit409caa2110638391f25a10e9146fe193bec36cf8 (patch)
treec0e72744fa1cd22fa3cfda326920f05ccd98b525 /lib/crypto
parentc0c0505e337da0c1e2e501135b4b0fb3af60d2b6 (diff)
downloadotp-409caa2110638391f25a10e9146fe193bec36cf8.tar.gz
otp-409caa2110638391f25a10e9146fe193bec36cf8.tar.bz2
otp-409caa2110638391f25a10e9146fe193bec36cf8.zip
Revamp non-EVP hash_final_nif()
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/c_src/hash.c57
1 files changed, 38 insertions, 19 deletions
diff --git a/lib/crypto/c_src/hash.c b/lib/crypto/c_src/hash.c
index f25d59e9ab..c9fcd35ca2 100644
--- a/lib/crypto/c_src/hash.c
+++ b/lib/crypto/c_src/hash.c
@@ -395,20 +395,24 @@ ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
int arity;
struct digest_type_t *digp = NULL;
const EVP_MD *md;
- void *new_ctx;
+ void *new_ctx = NULL;
size_t ctx_size = 0;
final_fun ctx_final = 0;
+ unsigned char *outp;
- if (!enif_get_tuple(env, argv[0], &arity, &tuple) ||
- arity != 2 ||
- !(digp = get_digest_type(tuple[0])) ||
- !enif_inspect_binary(env, tuple[1], &ctx)) {
- return enif_make_badarg(env);
- }
- md = digp->md.p;
- if (!md) {
- return atom_notsup;
- }
+ if (argc != 1)
+ goto bad_arg;
+ if (!enif_get_tuple(env, argv[0], &arity, &tuple))
+ goto bad_arg;
+ if (arity != 2)
+ goto bad_arg;
+ if ((digp = get_digest_type(tuple[0])) == NULL)
+ goto bad_arg;
+ if (!enif_inspect_binary(env, tuple[1], &ctx))
+ goto bad_arg;
+
+ if ((md = digp->md.p) == NULL)
+ goto err;
switch (EVP_MD_type(md))
{
@@ -453,21 +457,36 @@ ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
break;
#endif
default:
- return atom_notsup;
+ goto err;
}
ASSERT(ctx_size);
ASSERT(ctx_final);
- if (ctx.size != ctx_size) {
- return enif_make_badarg(env);
- }
+ if (ctx.size != ctx_size)
+ goto bad_arg;
+
+ if ((new_ctx = enif_alloc(ctx_size)) == NULL)
+ goto err;
- new_ctx = enif_alloc(ctx_size);
memcpy(new_ctx, ctx.data, ctx_size);
- ctx_final(enif_make_new_binary(env, (size_t)EVP_MD_size(md), &ret),
- new_ctx);
- enif_free(new_ctx);
+ if ((outp = enif_make_new_binary(env, (size_t)EVP_MD_size(md), &ret)) == NULL)
+ goto err;
+
+ if (ctx_final(outp, new_ctx) != 1)
+ goto err;
+
+ goto done;
+
+ bad_arg:
+ return enif_make_badarg(env);
+
+ err:
+ ret = atom_notsup;
+
+ done:
+ if (new_ctx)
+ enif_free(new_ctx);
return ret;
}