File 1632-crypto-pkey.c-Change-badarg-to-notsup-and-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1632-crypto-pkey.c-Change-badarg-to-notsup-and-refactor.patch of Package erlang (Revision 9919a33af6076f76c1940ec244471607)

Currently displaying revision 9919a33af6076f76c1940ec244471607 , Show latest

From 10372f2afdd72be298e51d0afed94c429e514fd1 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 2 Jun 2020 10:34:10 +0200
Subject: [PATCH 02/17] crypto: pkey.c Change badarg to notsup and refactor

for increased readability.
---
 lib/crypto/c_src/pkey.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/lib/crypto/c_src/pkey.c b/lib/crypto/c_src/pkey.c
index 2125aed537..1824a08fb9 100644
--- a/lib/crypto/c_src/pkey.c
+++ b/lib/crypto/c_src/pkey.c
@@ -282,10 +282,10 @@ static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
 #else
         return PKEY_BADARG;
 #endif
+
     } else if (algorithm == atom_rsa) {
         if ((rsa = RSA_new()) == NULL)
             goto err;
-
         if (!get_rsa_private_key(env, key, rsa))
             goto err;
         if ((result = EVP_PKEY_new()) == NULL)
@@ -299,7 +299,6 @@ static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
 #if defined(HAVE_EC)
 	const ERL_NIF_TERM *tpl_terms;
 	int tpl_arity;
-
         if (!enif_get_tuple(env, key, &tpl_arity, &tpl_terms))
             goto err;
         if (tpl_arity != 2)
@@ -317,48 +316,41 @@ static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
             goto err;
         /* On success, result owns ec */
         ec = NULL;
-
 #else
 	return PKEY_NOTSUP;
 #endif
+
     } else if (algorithm == atom_eddsa) {
 #ifdef HAVE_EDDSA
-        if (!FIPS_mode())
-            {
-                if (!get_eddsa_key(env, 0, key, &result))
-                    goto err;
-                else
-                    goto done; // Not nice....
-            }
+        if (FIPS_mode())
+            return PKEY_NOTSUP;
+        if (!get_eddsa_key(env, 0, key, &result))
+            goto err;
 #else
             return PKEY_NOTSUP;
 #endif
+
     } else if (algorithm == atom_dss) {
 #ifdef HAVE_DSA
         if ((dsa = DSA_new()) == NULL)
             goto err;
         if (!get_dss_private_key(env, key, dsa))
             goto err;
-
         if ((result = EVP_PKEY_new()) == NULL)
             goto err;
         if (EVP_PKEY_assign_DSA(result, dsa) != 1)
             goto err;
         /* On success, result owns dsa */
         dsa = NULL;
-
-    } else {
+#else
+        return PKEY_NOTSUP;
 #endif
+
+    } else
 	return PKEY_BADARG;
-    }
-    goto done;
 
- err:
-    if (result)
-        EVP_PKEY_free(result);
-    result = NULL;
 
- done:
+ free_and_return:
     if (password)
         enif_free(password);
     if (id)
@@ -380,8 +372,15 @@ static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
         *pkey = result;
         return PKEY_OK;
     }
+
+ err:
+    if (result)
+        EVP_PKEY_free(result);
+    result = NULL;
+    goto free_and_return;
 }
 
+
 static int get_pkey_public_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key,
 			       EVP_PKEY **pkey)
 {
-- 
2.31.1

Places

File 1632-crypto-pkey.c-Change-badarg-to-notsup-and-refactor.patch of Package erlang (Revision 9919a33af6076f76c1940ec244471607)

Places