1 files changed, 69 insertions, 64 deletions

diff --git a/src/lib/libcrypto/evp/pmeth_gn.c b/src/lib/libcrypto/evp/pmeth_gn.c
index 4651c81370..c6683ab89b 100644
--- a/src/lib/libcrypto/evp/pmeth_gn.c
+++ b/src/lib/libcrypto/evp/pmeth_gn.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -64,15 +64,16 @@
 #include <openssl/bn.h>
 #include "evp_locl.h"
 
-int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
-        {
+int
+EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
+{
         int ret;
-        if (!ctx || !ctx->pmeth || !ctx->pmeth->paramgen)
-                {
+
+        if (!ctx || !ctx->pmeth || !ctx->pmeth->paramgen) {
                 EVPerr(EVP_F_EVP_PKEY_PARAMGEN_INIT,
-                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+                    EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                 return -2;
-                }
+        }
         ctx->operation = EVP_PKEY_OP_PARAMGEN;
         if (!ctx->pmeth->paramgen_init)
                 return 1;
@@ -80,23 +81,23 @@ int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
         if (ret <= 0)
                 ctx->operation = EVP_PKEY_OP_UNDEFINED;
         return ret;
-        }
+}
 
-int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
-        {
+int
+EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
+{
         int ret;
-        if (!ctx || !ctx->pmeth || !ctx->pmeth->paramgen)
-                {
+
+        if (!ctx || !ctx->pmeth || !ctx->pmeth->paramgen) {
                 EVPerr(EVP_F_EVP_PKEY_PARAMGEN,
-                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+                    EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                 return -2;
-                }
+        }
 
-        if (ctx->operation != EVP_PKEY_OP_PARAMGEN)
-                {
+        if (ctx->operation != EVP_PKEY_OP_PARAMGEN) {
                 EVPerr(EVP_F_EVP_PKEY_PARAMGEN, EVP_R_OPERATON_NOT_INITIALIZED);
                 return -1;
-                }
+        }
 
         if (!ppkey)
                 return -1;
@@ -105,23 +106,23 @@ int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
                 *ppkey = EVP_PKEY_new();
 
         ret = ctx->pmeth->paramgen(ctx, *ppkey);
-        if (ret <= 0)
-                {
+        if (ret <= 0) {
                 EVP_PKEY_free(*ppkey);
                 *ppkey = NULL;
-                }
-        return ret;
         }
+        return ret;
+}
 
-int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx)
-        {
+int
+EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx)
+{
         int ret;
-        if (!ctx || !ctx->pmeth || !ctx->pmeth->keygen)
-                {
+
+        if (!ctx || !ctx->pmeth || !ctx->pmeth->keygen) {
                 EVPerr(EVP_F_EVP_PKEY_KEYGEN_INIT,
-                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+                    EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                 return -2;
-                }
+        }
         ctx->operation = EVP_PKEY_OP_KEYGEN;
         if (!ctx->pmeth->keygen_init)
                 return 1;
@@ -129,23 +130,22 @@ int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx)
         if (ret <= 0)
                 ctx->operation = EVP_PKEY_OP_UNDEFINED;
         return ret;
-        }
+}
 
-int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
-        {
+int
+EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
+{
         int ret;
 
-        if (!ctx || !ctx->pmeth || !ctx->pmeth->keygen)
-                {
+        if (!ctx || !ctx->pmeth || !ctx->pmeth->keygen) {
                 EVPerr(EVP_F_EVP_PKEY_KEYGEN,
-                        EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+                    EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                 return -2;
-                }
-        if (ctx->operation != EVP_PKEY_OP_KEYGEN)
-                {
+        }
+        if (ctx->operation != EVP_PKEY_OP_KEYGEN) {
                 EVPerr(EVP_F_EVP_PKEY_KEYGEN, EVP_R_OPERATON_NOT_INITIALIZED);
                 return -1;
-                }
+        }
 
         if (!ppkey)
                 return -1;
@@ -154,68 +154,73 @@ int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
                 *ppkey = EVP_PKEY_new();
 
         ret = ctx->pmeth->keygen(ctx, *ppkey);
-        if (ret <= 0)
-                {
+        if (ret <= 0) {
                 EVP_PKEY_free(*ppkey);
                 *ppkey = NULL;
-                }
-        return ret;
         }
+        return ret;
+}
 
-void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb)
-        {
+void
+EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb)
+{
         ctx->pkey_gencb = cb;
-        }
+}
 
-EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx)
-        {
+EVP_PKEY_gen_cb *
+EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx)
+{
         return ctx->pkey_gencb;
-        }
+}
 
 /* "translation callback" to call EVP_PKEY_CTX callbacks using BN_GENCB
  * style callbacks.
  */
 
-static int trans_cb(int a, int b, BN_GENCB *gcb)
-        {
+static int
+trans_cb(int a, int b, BN_GENCB *gcb)
+{
         EVP_PKEY_CTX *ctx = gcb->arg;
         ctx->keygen_info[0] = a;
         ctx->keygen_info[1] = b;
         return ctx->pkey_gencb(ctx);
-        }       
+}
 
-void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx)
-        {
+void
+evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx)
+{
         BN_GENCB_set(cb, trans_cb, ctx)
-        }
+}
 
-int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
-        {
+int
+EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
+{
         if (idx == -1)
-                return ctx->keygen_info_count; 
+                return ctx->keygen_info_count;
         if (idx < 0 || idx > ctx->keygen_info_count)
                 return 0;
         return ctx->keygen_info[idx];
-        }
+}
 
-EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-                                const unsigned char *key, int keylen)
-        {
+EVP_PKEY *
+EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key, int keylen)
+{
         EVP_PKEY_CTX *mac_ctx = NULL;
         EVP_PKEY *mac_key = NULL;
+
         mac_ctx = EVP_PKEY_CTX_new_id(type, e);
         if (!mac_ctx)
                 return NULL;
         if (EVP_PKEY_keygen_init(mac_ctx) <= 0)
                 goto merr;
         if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN,
-                                EVP_PKEY_CTRL_SET_MAC_KEY,
-                                keylen, (void *)key) <= 0)
+            EVP_PKEY_CTRL_SET_MAC_KEY, keylen, (void *)key) <= 0)
                 goto merr;
         if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
                 goto merr;
-        merr:
+
+merr:
         if (mac_ctx)
                 EVP_PKEY_CTX_free(mac_ctx);
         return mac_key;
-        }
+}