aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorDoug Hogan <[email protected]>2019-01-03 15:56:32 -0800
committerDoug Hogan <[email protected]>2019-01-08 00:08:21 -0800
commitb276e51d590985b7596f77c28ea8ab6d23f1d8b5 (patch)
tree47baede877fea01dfd5fdd439256f17f46b09f7b /lib/crypto
parenta1660045fc9e88b8f6a2615f3941177fcaa5541d (diff)
downloadotp-b276e51d590985b7596f77c28ea8ab6d23f1d8b5.tar.gz
otp-b276e51d590985b7596f77c28ea8ab6d23f1d8b5.tar.bz2
otp-b276e51d590985b7596f77c28ea8ab6d23f1d8b5.zip
Revamp get_eddsa_key()
* pkey is only set on success.
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/c_src/eddsa.c38
1 files changed, 25 insertions, 13 deletions
diff --git a/lib/crypto/c_src/eddsa.c b/lib/crypto/c_src/eddsa.c
index 0fdada9677..0c89f9f6db 100644
--- a/lib/crypto/c_src/eddsa.c
+++ b/lib/crypto/c_src/eddsa.c
@@ -24,28 +24,40 @@
int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey)
{
/* key=[K] */
+ EVP_PKEY *result;
ERL_NIF_TERM head, tail, tail2, algo;
ErlNifBinary bin;
int type;
- if (!enif_get_list_cell(env, key, &head, &tail)
- || !enif_inspect_binary(env, head, &bin)
- || !enif_get_list_cell(env, tail, &algo, &tail2)
- || !enif_is_empty_list(env, tail2)) {
- return 0;
+ if (!enif_get_list_cell(env, key, &head, &tail))
+ goto err;
+ if (!enif_inspect_binary(env, head, &bin))
+ goto err;
+ if (!enif_get_list_cell(env, tail, &algo, &tail2))
+ goto err;
+ if (!enif_is_empty_list(env, tail2))
+ goto err;
+
+ if (algo == atom_ed25519) {
+ type = EVP_PKEY_ED25519;
+ } else if (algo == atom_ed448) {
+ type = EVP_PKEY_ED448;
+ } else {
+ goto err;
}
- if (algo == atom_ed25519) type = EVP_PKEY_ED25519;
- else if (algo == atom_ed448) type = EVP_PKEY_ED448;
- else
- return 0;
if (public)
- *pkey = EVP_PKEY_new_raw_public_key(type, NULL, bin.data, bin.size);
+ result = EVP_PKEY_new_raw_public_key(type, NULL, bin.data, bin.size);
else
- *pkey = EVP_PKEY_new_raw_private_key(type, NULL, bin.data, bin.size);
+ result = EVP_PKEY_new_raw_private_key(type, NULL, bin.data, bin.size);
+
+ if (result == NULL)
+ goto err;
- if (!pkey)
- return 0;
+ *pkey = result;
return 1;
+
+ err:
+ return 0;
}
#endif