1 files changed, 65 insertions, 71 deletions

diff --git a/src/lib/libcrypto/ecdh/ech_ossl.c b/src/lib/libcrypto/ecdh/ech_ossl.c
index 4fae7cacfd..f05db87f78 100644
--- a/src/lib/libcrypto/ecdh/ech_ossl.c
+++ b/src/lib/libcrypto/ecdh/ech_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_ossl.c,v 1.9 2015/02/09 15:49:22 jsing Exp $ */
+/* $OpenBSD: ech_ossl.c,v 1.10 2015/09/13 10:46:20 jsing Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -21,7 +21,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
@@ -80,18 +80,19 @@
 #include "ech_locl.h"
 
 static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key,
-        EC_KEY *ecdh, 
-        void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
+    EC_KEY *ecdh,
+    void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
 
 static ECDH_METHOD openssl_ecdh_meth = {
         .name = "OpenSSL ECDH method",
         .compute_key = ecdh_compute_key
 };
 
-const ECDH_METHOD *ECDH_OpenSSL(void)
-        {
+const ECDH_METHOD *
+ECDH_OpenSSL(void)
+{
         return &openssl_ecdh_meth;
-        }
+}
 
 
 /* This implementation is based on the following primitives in the IEEE 1363 standard:
@@ -99,114 +100,107 @@ const ECDH_METHOD *ECDH_OpenSSL(void)
  *  - ECSVDP-DH
  * Finally an optional KDF is applied.
  */
-static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
-        EC_KEY *ecdh,
-        void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
-        {
+static int
+ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
+    EC_KEY *ecdh,
+    void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
+{
         BN_CTX *ctx;
-        EC_POINT *tmp=NULL;
-        BIGNUM *x=NULL, *y=NULL;
+        EC_POINT *tmp = NULL;
+        BIGNUM *x = NULL, *y = NULL;
         const BIGNUM *priv_key;
         const EC_GROUP* group;
-        int ret= -1;
+        int ret = -1;
         size_t buflen, len;
-        unsigned char *buf=NULL;
+        unsigned char *buf = NULL;
 
-        if (outlen > INT_MAX)
-                {
+        if (outlen > INT_MAX) {
                 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE); /* sort of, anyway */
                 return -1;
-                }
+        }
 
-        if ((ctx = BN_CTX_new()) == NULL) goto err;
+        if ((ctx = BN_CTX_new()) == NULL)
+                goto err;
         BN_CTX_start(ctx);
         if ((x = BN_CTX_get(ctx)) == NULL)
                 goto err;
         if ((y = BN_CTX_get(ctx)) == NULL)
                 goto err;
-        
+
         priv_key = EC_KEY_get0_private_key(ecdh);
-        if (priv_key == NULL)
-                {
-                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_NO_PRIVATE_VALUE);
+        if (priv_key == NULL) {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_NO_PRIVATE_VALUE);
                 goto err;
-                }
+        }
 
         group = EC_KEY_get0_group(ecdh);
-        if ((tmp=EC_POINT_new(group)) == NULL)
-                {
-                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);
+        if ((tmp = EC_POINT_new(group)) == NULL) {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
-        if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) 
-                {
-                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+        if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,
+                    ECDH_R_POINT_ARITHMETIC_FAILURE);
                 goto err;
-                }
-                
-        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
-                {
-                if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y, ctx)) 
-                        {
-                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+        }
+
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
+            NID_X9_62_prime_field) {
+                if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y,
+                    ctx)) {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,
+                            ECDH_R_POINT_ARITHMETIC_FAILURE);
                         goto err;
-                        }
                 }
+        }
 #ifndef OPENSSL_NO_EC2M
-        else
-                {
-                if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) 
-                        {
-                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+        else {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y,
+                    ctx)) {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,
+                            ECDH_R_POINT_ARITHMETIC_FAILURE);
                         goto err;
-                        }
                 }
+        }
 #endif
 
         buflen = (EC_GROUP_get_degree(group) + 7)/8;
         len = BN_num_bytes(x);
-        if (len > buflen)
-                {
-                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_INTERNAL_ERROR);
+        if (len > buflen) {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_INTERNAL_ERROR);
                 goto err;
-                }
-        if ((buf = malloc(buflen)) == NULL)
-                {
-                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);
+        }
+        if ((buf = malloc(buflen)) == NULL) {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
-        
+        }
+
         memset(buf, 0, buflen - len);
-        if (len != (size_t)BN_bn2bin(x, buf + buflen - len))
-                {
-                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_BN_LIB);
+        if (len != (size_t)BN_bn2bin(x, buf + buflen - len)) {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_BN_LIB);
                 goto err;
-                }
+        }
 
-        if (KDF != 0)
-                {
-                if (KDF(buf, buflen, out, &outlen) == NULL)
-                        {
-                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_KDF_FAILED);
+        if (KDF != 0) {
+                if (KDF(buf, buflen, out, &outlen) == NULL) {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_KDF_FAILED);
                         goto err;
-                        }
-                ret = outlen;
                 }
-        else
-                {
+                ret = outlen;
+        } else {
                 /* no KDF, just copy as much as we can */
                 if (outlen > buflen)
                         outlen = buflen;
                 memcpy(out, buf, outlen);
                 ret = outlen;
-                }
-        
+        }
+
 err:
         EC_POINT_free(tmp);
         if (ctx)
                 BN_CTX_end(ctx);
         BN_CTX_free(ctx);
         free(buf);
-        return(ret);
-        }
+        return (ret);
+}