1 files changed, 60 insertions, 53 deletions

diff --git a/src/lib/libcrypto/dh/dh_pmeth.c b/src/lib/libcrypto/dh/dh_pmeth.c
index cb424ac149..fb441b563b 100644
--- a/src/lib/libcrypto/dh/dh_pmeth.c
+++ b/src/lib/libcrypto/dh/dh_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_pmeth.c,v 1.6 2014/06/12 20:40:57 deraadt Exp $ */
+/* $OpenBSD: dh_pmeth.c,v 1.7 2014/07/09 13:26:47 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -68,8 +68,7 @@
 
 /* DH pkey context structure */
 
-typedef struct
-        {
+typedef struct {
         /* Parameter gen parameters */
         int prime_len;
         int generator;
@@ -77,11 +76,13 @@ typedef struct
         /* Keygen callback info */
         int gentmp[2];
         /* message digest */
-        } DH_PKEY_CTX;
+} DH_PKEY_CTX;
 
-static int pkey_dh_init(EVP_PKEY_CTX *ctx)
-        {
+static int
+pkey_dh_init(EVP_PKEY_CTX *ctx)
+{
         DH_PKEY_CTX *dctx;
+
         dctx = malloc(sizeof(DH_PKEY_CTX));
         if (!dctx)
                 return 0;
@@ -94,11 +95,13 @@ static int pkey_dh_init(EVP_PKEY_CTX *ctx)
         ctx->keygen_info_count = 2;
         
         return 1;
-        }
+}
 
-static int pkey_dh_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
-        {
+static int
+pkey_dh_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
+{
         DH_PKEY_CTX *dctx, *sctx;
+
         if (!pkey_dh_init(dst))
                 return 0;
         sctx = src->data;
@@ -107,43 +110,44 @@ static int pkey_dh_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
         dctx->generator = sctx->generator;
         dctx->use_dsa = sctx->use_dsa;
         return 1;
-        }
+}
 
-static void pkey_dh_cleanup(EVP_PKEY_CTX *ctx)
-        {
+static void
+pkey_dh_cleanup(EVP_PKEY_CTX *ctx)
+{
         DH_PKEY_CTX *dctx = ctx->data;
+
         free(dctx);
-        }
+}
 
-static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
-        {
+static int
+pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
+{
         DH_PKEY_CTX *dctx = ctx->data;
-        switch (type)
-                {
-                case EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN:
+
+        switch (type) {
+        case EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN:
                 if (p1 < 256)
                         return -2;
                 dctx->prime_len = p1;
                 return 1;
 
-                case EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR:
+        case EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR:
                 dctx->generator = p1;
                 return 1;
 
-                case EVP_PKEY_CTRL_PEER_KEY:
+        case EVP_PKEY_CTRL_PEER_KEY:
                 /* Default behaviour is OK */
                 return 1;
 
-                default:
+        default:
                 return -2;
-
-                }
         }
-
+}
                         
-static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
-                        const char *type, const char *value)
-        {
+static int
+pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value)
+{
         long lval;
         char *ep;
         int len;
@@ -153,18 +157,19 @@ static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
                 lval = strtol(value, &ep, 10);
                 if (value[0] == '\0' || *ep != '\0')
                         goto not_a_number;
-                if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+                if ((errno == ERANGE &&
+                    (lval == LONG_MAX || lval == LONG_MIN)) ||
                     (lval > INT_MAX || lval < INT_MIN))
                         goto out_of_range;
                 len = lval;
                 return EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len);
-        }
-        if (!strcmp(type, "dh_paramgen_generator")) {
+        } else if (!strcmp(type, "dh_paramgen_generator")) {
                 errno = 0;
                 lval = strtol(value, &ep, 10);
                 if (value[0] == '\0' || *ep != '\0')
                         goto not_a_number;
-                if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+                if ((errno == ERANGE &&
+                    (lval == LONG_MAX || lval == LONG_MIN)) ||
                     (lval > INT_MAX || lval < INT_MIN))
                         goto out_of_range;
                 len = lval;
@@ -176,39 +181,40 @@ out_of_range:
         return -2;
 }
 
-static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
-        {
+static int
+pkey_dh_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+{
         DH *dh = NULL;
         DH_PKEY_CTX *dctx = ctx->data;
         BN_GENCB *pcb, cb;
         int ret;
-        if (ctx->pkey_gencb)
-                {
+
+        if (ctx->pkey_gencb) {
                 pcb = &cb;
                 evp_pkey_set_cb_translate(pcb, ctx);
-                }
-        else
+        } else
                 pcb = NULL;
         dh = DH_new();
         if (!dh)
                 return 0;
-        ret = DH_generate_parameters_ex(dh,
-                                        dctx->prime_len, dctx->generator, pcb);
+        ret = DH_generate_parameters_ex(dh, dctx->prime_len, dctx->generator,
+            pcb);
         if (ret)
                 EVP_PKEY_assign_DH(pkey, dh);
         else
                 DH_free(dh);
         return ret;
-        }
+}
 
-static int pkey_dh_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
-        {
+static int
+pkey_dh_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+{
         DH *dh = NULL;
-        if (ctx->pkey == NULL)
-                {
+
+        if (ctx->pkey == NULL) {
                 DHerr(DH_F_PKEY_DH_KEYGEN, DH_R_NO_PARAMETERS_SET);
                 return 0;
-                }
+        }
         dh = DH_new();
         if (!dh)
                 return 0;
@@ -217,23 +223,24 @@ static int pkey_dh_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         if (!EVP_PKEY_copy_parameters(pkey, ctx->pkey))
                 return 0;
         return DH_generate_key(pkey->pkey.dh);
-        }
+}
 
-static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
-        {
+static int
+pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
+{
         int ret;
-        if (!ctx->pkey || !ctx->peerkey)
-                {
+
+        if (!ctx->pkey || !ctx->peerkey) {
                 DHerr(DH_F_PKEY_DH_DERIVE, DH_R_KEYS_NOT_SET);
                 return 0;
-                }
+        }
         ret = DH_compute_key(key, ctx->peerkey->pkey.dh->pub_key,
-                                                        ctx->pkey->pkey.dh);
+            ctx->pkey->pkey.dh);
         if (ret < 0)
                 return ret;
         *keylen = ret;
         return 1;
-        }
+}
 
 const EVP_PKEY_METHOD dh_pkey_meth = {
         .pkey_id = EVP_PKEY_DH,