1 files changed, 146 insertions, 149 deletions

diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c
index 88ef78d98d..9e911c8779 100644
--- a/src/lib/libcrypto/dh/dh_ameth.c
+++ b/src/lib/libcrypto/dh/dh_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_ameth.c,v 1.8 2014/06/30 14:15:34 tedu Exp $ */
+/* $OpenBSD: dh_ameth.c,v 1.9 2014/07/09 13:26:47 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -64,13 +64,15 @@
 #include <openssl/bn.h>
 #include "asn1_locl.h"
 
-static void int_dh_free(EVP_PKEY *pkey)
-        {
+static void
+int_dh_free(EVP_PKEY *pkey)
+{
         DH_free(pkey->pkey.dh);
-        }
+}
 
-static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
-        {
+static int
+dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
+{
         const unsigned char *p, *pm;
         int pklen, pmlen;
         int ptype;
@@ -78,57 +80,52 @@ static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
         ASN1_STRING *pstr;
         X509_ALGOR *palg;
         ASN1_INTEGER *public_key = NULL;
-
         DH *dh = NULL;
 
         if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, &palg, pubkey))
                 return 0;
         X509_ALGOR_get0(NULL, &ptype, &pval, palg);
 
-        if (ptype != V_ASN1_SEQUENCE)
-                {
+        if (ptype != V_ASN1_SEQUENCE) {
                 DHerr(DH_F_DH_PUB_DECODE, DH_R_PARAMETER_ENCODING_ERROR);
                 goto err;
-                }
+        }
 
         pstr = pval;    
         pm = pstr->data;
         pmlen = pstr->length;
 
-        if (!(dh = d2i_DHparams(NULL, &pm, pmlen)))
-                {
+        if (!(dh = d2i_DHparams(NULL, &pm, pmlen))) {
                 DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR);
                 goto err;
-                }
+        }
 
-        if (!(public_key=d2i_ASN1_INTEGER(NULL, &p, pklen)))
-                {
+        if (!(public_key=d2i_ASN1_INTEGER(NULL, &p, pklen))) {
                 DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR);
                 goto err;
-                }
+        }
 
         /* We have parameters now set public key */
-        if (!(dh->pub_key = ASN1_INTEGER_to_BN(public_key, NULL)))
-                {
+        if (!(dh->pub_key = ASN1_INTEGER_to_BN(public_key, NULL))) {
                 DHerr(DH_F_DH_PUB_DECODE, DH_R_BN_DECODE_ERROR);
                 goto err;
-                }
+        }
 
         ASN1_INTEGER_free(public_key);
         EVP_PKEY_assign_DH(pkey, dh);
         return 1;
 
-        err:
+err:
         if (public_key)
                 ASN1_INTEGER_free(public_key);
         if (dh)
                 DH_free(dh);
         return 0;
+}
 
-        }
-
-static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
-        {
+static int
+dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
+{
         DH *dh;
         int ptype;
         unsigned char *penc = NULL;
@@ -145,11 +142,10 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
         }
 
         str->length = i2d_DHparams(dh, &str->data);
-        if (str->length <= 0)
-                {
+        if (str->length <= 0) {
                 DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
         ptype = V_ASN1_SEQUENCE;
 
         pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL);
@@ -160,32 +156,32 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 
         ASN1_INTEGER_free(pub_key);
 
-        if (penclen <= 0)
-                {
+        if (penclen <= 0) {
                 DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
 
-        if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DH),
-                                ptype, (void *)str, penc, penclen))
+        if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DH), ptype,
+            (void *)str, penc, penclen))
                 return 1;
 
-        err:
+err:
         free(penc);
         if (str)
                 ASN1_STRING_free(str);
 
         return 0;
-        }
-
+}
 
-/* PKCS#8 DH is defined in PKCS#11 of all places. It is similar to DH in
+/*
+ * PKCS#8 DH is defined in PKCS#11 of all places. It is similar to DH in
  * that the AlgorithmIdentifier contains the paramaters, the private key
  * is explcitly included and the pubkey must be recalculated.
  */
         
-static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
-        {
+static int
+dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
+{
         const unsigned char *p, *pm;
         int pklen, pmlen;
         int ptype;
@@ -193,7 +189,6 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
         ASN1_STRING *pstr;
         X509_ALGOR *palg;
         ASN1_INTEGER *privkey = NULL;
-
         DH *dh = NULL;
 
         if (!PKCS8_pkey_get0(NULL, &p, &pklen, &palg, p8))
@@ -202,23 +197,21 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
         X509_ALGOR_get0(NULL, &ptype, &pval, palg);
 
         if (ptype != V_ASN1_SEQUENCE)
-                        goto decerr;
+                goto decerr;
 
         if (!(privkey=d2i_ASN1_INTEGER(NULL, &p, pklen)))
                 goto decerr;
 
-
         pstr = pval;    
         pm = pstr->data;
         pmlen = pstr->length;
         if (!(dh = d2i_DHparams(NULL, &pm, pmlen)))
                 goto decerr;
         /* We have parameters now set private key */
-        if (!(dh->priv_key = ASN1_INTEGER_to_BN(privkey, NULL)))
-                {
-                DHerr(DH_F_DH_PRIV_DECODE,DH_R_BN_ERROR);
+        if (!(dh->priv_key = ASN1_INTEGER_to_BN(privkey, NULL))) {
+                DHerr(DH_F_DH_PRIV_DECODE, DH_R_BN_ERROR);
                 goto dherr;
-                }
+        }
         /* Calculate public key */
         if (!DH_generate_key(dh))
                 goto dherr;
@@ -229,14 +222,15 @@ static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
 
         return 1;
 
-        decerr:
+decerr:
         DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR);
-        dherr:
+dherr:
         DH_free(dh);
         return 0;
-        }
+}
 
-static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
+static int
+dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 {
         ASN1_STRING *params = NULL;
         ASN1_INTEGER *prkey = NULL;
@@ -245,35 +239,32 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
         params = ASN1_STRING_new();
 
-        if (!params)
-                {
-                DHerr(DH_F_DH_PRIV_ENCODE,ERR_R_MALLOC_FAILURE);
+        if (!params) {
+                DHerr(DH_F_DH_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
         params->length = i2d_DHparams(pkey->pkey.dh, &params->data);
-        if (params->length <= 0)
-                {
+        if (params->length <= 0) {
                 DHerr(DH_F_DH_PRIV_ENCODE,ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
         params->type = V_ASN1_SEQUENCE;
 
         /* Get private key into integer */
         prkey = BN_to_ASN1_INTEGER(pkey->pkey.dh->priv_key, NULL);
 
-        if (!prkey)
-                {
-                DHerr(DH_F_DH_PRIV_ENCODE,DH_R_BN_ERROR);
+        if (!prkey) {
+                DHerr(DH_F_DH_PRIV_ENCODE, DH_R_BN_ERROR);
                 goto err;
-                }
+        }
 
         dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
         ASN1_INTEGER_free(prkey);
 
         if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dhKeyAgreement), 0,
-                                V_ASN1_SEQUENCE, params, dp, dplen))
+            V_ASN1_SEQUENCE, params, dp, dplen))
                 goto err;
 
         return 1;
@@ -287,43 +278,43 @@ err:
         return 0;
 }
 
-
-static void update_buflen(const BIGNUM *b, size_t *pbuflen)
-        {
+static void
+update_buflen(const BIGNUM *b, size_t *pbuflen)
+{
         size_t i;
+
         if (!b)
                 return;
         if (*pbuflen < (i = (size_t)BN_num_bytes(b)))
-                        *pbuflen = i;
-        }
+                *pbuflen = i;
+}
 
-static int dh_param_decode(EVP_PKEY *pkey,
-                                        const unsigned char **pder, int derlen)
-        {
+static int
+dh_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
+{
         DH *dh;
-        if (!(dh = d2i_DHparams(NULL, pder, derlen)))
-                {
+
+        if (!(dh = d2i_DHparams(NULL, pder, derlen))) {
                 DHerr(DH_F_DH_PARAM_DECODE, ERR_R_DH_LIB);
                 return 0;
-                }
+        }
         EVP_PKEY_assign_DH(pkey, dh);
         return 1;
-        }
+}
 
-static int dh_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
-        {
+static int
+dh_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
+{
         return i2d_DHparams(pkey->pkey.dh, pder);
-        }
-
-static int do_dh_print(BIO *bp, const DH *x, int indent,
-                                                ASN1_PCTX *ctx, int ptype)
-        {
-        unsigned char *m=NULL;
-        int reason=ERR_R_BUF_LIB,ret=0;
-        size_t buf_len=0;
+}
 
+static int
+do_dh_print(BIO *bp, const DH *x, int indent, ASN1_PCTX *ctx, int ptype)
+{
+        unsigned char *m = NULL;
+        int reason = ERR_R_BUF_LIB, ret = 0;
+        size_t buf_len = 0;
         const char *ktype = NULL;
-
         BIGNUM *priv_key, *pub_key;
 
         if (ptype == 2)
@@ -338,11 +329,10 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
 
         update_buflen(x->p, &buf_len);
 
-        if (buf_len == 0)
-                {
+        if (buf_len == 0) {
                 reason = ERR_R_PASSED_NULL_PARAMETER;
                 goto err;
-                }
+        }
 
         update_buflen(x->g, &buf_len);
         update_buflen(pub_key, &buf_len);
@@ -355,118 +345,126 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
         else
                 ktype = "PKCS#3 DH Parameters";
 
-        m= malloc(buf_len+10);
-        if (m == NULL)
-                {
-                reason=ERR_R_MALLOC_FAILURE;
+        m= malloc(buf_len + 10);
+        if (m == NULL) {
+                reason = ERR_R_MALLOC_FAILURE;
                 goto err;
-                }
+        }
 
         BIO_indent(bp, indent, 128);
-        if (BIO_printf(bp,"%s: (%d bit)\n", ktype, BN_num_bits(x->p)) <= 0)
+        if (BIO_printf(bp, "%s: (%d bit)\n", ktype, BN_num_bits(x->p)) <= 0)
                 goto err;
         indent += 4;
 
-        if (!ASN1_bn_print(bp,"private-key:",priv_key,m,indent)) goto err;
-        if (!ASN1_bn_print(bp,"public-key:",pub_key,m,indent)) goto err;
+        if (!ASN1_bn_print(bp, "private-key:", priv_key, m, indent))
+                goto err;
+        if (!ASN1_bn_print(bp, "public-key:", pub_key, m, indent))
+                goto err;
 
-        if (!ASN1_bn_print(bp,"prime:",x->p,m,indent)) goto err;
-        if (!ASN1_bn_print(bp,"generator:",x->g,m,indent)) goto err;
-        if (x->length != 0)
-                {
+        if (!ASN1_bn_print(bp, "prime:", x->p, m, indent))
+                goto err;
+        if (!ASN1_bn_print(bp, "generator:", x->g, m, indent))
+                goto err;
+        if (x->length != 0) {
                 BIO_indent(bp, indent, 128);
-                if (BIO_printf(bp,"recommended-private-length: %d bits\n",
-                        (int)x->length) <= 0) goto err;
-                }
-
+                if (BIO_printf(bp, "recommended-private-length: %d bits\n",
+                    (int)x->length) <= 0)
+                        goto err;
+        }
 
-        ret=1;
-        if (0)
-                {
+        ret = 1;
+        if (0) {
 err:
                 DHerr(DH_F_DO_DH_PRINT,reason);
-                }
+        }
         free(m);
         return(ret);
-        }
+}
 
-static int int_dh_size(const EVP_PKEY *pkey)
-        {
-        return(DH_size(pkey->pkey.dh));
-        }
+static int
+int_dh_size(const EVP_PKEY *pkey)
+{
+        return DH_size(pkey->pkey.dh);
+}
 
-static int dh_bits(const EVP_PKEY *pkey)
-        {
+static int
+dh_bits(const EVP_PKEY *pkey)
+{
         return BN_num_bits(pkey->pkey.dh->p);
-        }
+}
 
-static int dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
-        {
-        if (    BN_cmp(a->pkey.dh->p,b->pkey.dh->p) ||
-                BN_cmp(a->pkey.dh->g,b->pkey.dh->g))
+static int
+dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
+{
+        if (BN_cmp(a->pkey.dh->p, b->pkey.dh->p) ||
+            BN_cmp(a->pkey.dh->g, b->pkey.dh->g))
                 return 0;
         else
                 return 1;
-        }
+}
 
-static int dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
-        {
+static int
+dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
+{
         BIGNUM *a;
 
-        if ((a=BN_dup(from->pkey.dh->p)) == NULL)
+        if ((a = BN_dup(from->pkey.dh->p)) == NULL)
                 return 0;
         if (to->pkey.dh->p != NULL)
                 BN_free(to->pkey.dh->p);
-        to->pkey.dh->p=a;
+        to->pkey.dh->p = a;
 
-        if ((a=BN_dup(from->pkey.dh->g)) == NULL)
+        if ((a = BN_dup(from->pkey.dh->g)) == NULL)
                 return 0;
         if (to->pkey.dh->g != NULL)
                 BN_free(to->pkey.dh->g);
-        to->pkey.dh->g=a;
+        to->pkey.dh->g = a;
 
         return 1;
-        }
+}
 
-static int dh_missing_parameters(const EVP_PKEY *a)
-        {
+static int
+dh_missing_parameters(const EVP_PKEY *a)
+{
         if (!a->pkey.dh->p || !a->pkey.dh->g)
                 return 1;
         return 0;
-        }
+}
 
-static int dh_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
-        {
+static int
+dh_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
+{
         if (dh_cmp_parameters(a, b) == 0)
                 return 0;
-        if (BN_cmp(b->pkey.dh->pub_key,a->pkey.dh->pub_key) != 0)
+        if (BN_cmp(b->pkey.dh->pub_key, a->pkey.dh->pub_key) != 0)
                 return 0;
         else
                 return 1;
-        }
+}
 
-static int dh_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                                                        ASN1_PCTX *ctx)
-        {
+static int
+dh_param_print(BIO *bp, const EVP_PKEY *pkey, int indent, ASN1_PCTX *ctx)
+{
         return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 0);
-        }
+}
 
-static int dh_public_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                                                        ASN1_PCTX *ctx)
-        {
+static int
+dh_public_print(BIO *bp, const EVP_PKEY *pkey, int indent, ASN1_PCTX *ctx)
+{
         return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 1);
-        }
+}
 
-static int dh_private_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                                                        ASN1_PCTX *ctx)
-        {
+static int
+dh_private_print(BIO *bp, const EVP_PKEY *pkey, int indent, ASN1_PCTX *ctx)
+{
         return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 2);
-        }
+}
 
-int DHparams_print(BIO *bp, const DH *x)
-        {
+int
+DHparams_print(BIO *bp, const DH *x)
+{
         return do_dh_print(bp, x, 4, NULL, 0);
-        }
+}
 
 const EVP_PKEY_ASN1_METHOD dh_asn1_meth = {
         .pkey_id = EVP_PKEY_DH,
@@ -496,4 +494,3 @@ const EVP_PKEY_ASN1_METHOD dh_asn1_meth = {
 
         .pkey_free = int_dh_free,
 };
-