1 files changed, 51 insertions, 68 deletions

diff --git a/lib/libssl/src/crypto/ec/ec_print.c b/lib/libssl/src/crypto/ec/ec_print.c
index 1655332c3c5..84a78903b38 100644
--- a/lib/libssl/src/crypto/ec/ec_print.c
+++ b/lib/libssl/src/crypto/ec/ec_print.c
@@ -7,7 +7,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
@@ -56,29 +56,25 @@
 #include <openssl/crypto.h>
 #include "ec_lcl.h"
 
-BIGNUM *EC_POINT_point2bn(const EC_GROUP *group, 
-                          const EC_POINT *point, 
-                          point_conversion_form_t form,
-                          BIGNUM *ret,
-                          BN_CTX *ctx)
-	{
-	size_t        buf_len=0;
+BIGNUM *
+EC_POINT_point2bn(const EC_GROUP * group, const EC_POINT * point,
+    point_conversion_form_t form, BIGNUM * ret, BN_CTX * ctx)
+{
+	size_t buf_len = 0;
 	unsigned char *buf;
 
 	buf_len = EC_POINT_point2oct(group, point, form,
-                                     NULL, 0, ctx);
+	    NULL, 0, ctx);
 	if (buf_len == 0)
 		return NULL;
 
 	if ((buf = malloc(buf_len)) == NULL)
 		return NULL;
 
-	if (!EC_POINT_point2oct(group, point, form, buf, buf_len, ctx))
-		{
+	if (!EC_POINT_point2oct(group, point, form, buf, buf_len, ctx)) {
 		free(buf);
 		return NULL;
-		}
-
+	}
 	ret = BN_bin2bn(buf, buf_len, ret);
 
 	free(buf);
@@ -86,103 +82,90 @@ BIGNUM *EC_POINT_point2bn(const EC_GROUP *group,
 	return ret;
 }
 
-EC_POINT *EC_POINT_bn2point(const EC_GROUP *group,
-                            const BIGNUM *bn,
-                            EC_POINT *point, 
-                            BN_CTX *ctx)
-	{
-	size_t        buf_len=0;
+EC_POINT *
+EC_POINT_bn2point(const EC_GROUP * group,
+    const BIGNUM * bn, EC_POINT * point, BN_CTX * ctx)
+{
+	size_t buf_len = 0;
 	unsigned char *buf;
-	EC_POINT      *ret;
+	EC_POINT *ret;
 
-	if ((buf_len = BN_num_bytes(bn)) == 0) return NULL;
+	if ((buf_len = BN_num_bytes(bn)) == 0)
+		return NULL;
 	buf = malloc(buf_len);
 	if (buf == NULL)
 		return NULL;
 
-	if (!BN_bn2bin(bn, buf)) 
-		{
+	if (!BN_bn2bin(bn, buf)) {
 		free(buf);
 		return NULL;
-		}
-
-	if (point == NULL)
-		{
-		if ((ret = EC_POINT_new(group)) == NULL)
-			{
+	}
+	if (point == NULL) {
+		if ((ret = EC_POINT_new(group)) == NULL) {
 			free(buf);
 			return NULL;
-			}
 		}
-	else
+	} else
 		ret = point;
 
-	if (!EC_POINT_oct2point(group, ret, buf, buf_len, ctx))
-		{
+	if (!EC_POINT_oct2point(group, ret, buf, buf_len, ctx)) {
 		if (point == NULL)
 			EC_POINT_clear_free(ret);
 		free(buf);
 		return NULL;
-		}
-
+	}
 	free(buf);
 	return ret;
-	}
+}
 
 static const char *HEX_DIGITS = "0123456789ABCDEF";
 
 /* the return value must be freed (using free()) */
-char *EC_POINT_point2hex(const EC_GROUP *group,
-                         const EC_POINT *point,
-                         point_conversion_form_t form,
-                         BN_CTX *ctx)
-	{
-	char          *ret, *p;
-	size_t        buf_len=0,i;
+char *
+EC_POINT_point2hex(const EC_GROUP * group, const EC_POINT * point,
+    point_conversion_form_t form, BN_CTX * ctx)
+{
+	char *ret, *p;
+	size_t buf_len = 0, i;
 	unsigned char *buf, *pbuf;
 
 	buf_len = EC_POINT_point2oct(group, point, form,
-                                     NULL, 0, ctx);
+	    NULL, 0, ctx);
 	if (buf_len == 0)
 		return NULL;
 
 	if ((buf = malloc(buf_len)) == NULL)
 		return NULL;
 
-	if (!EC_POINT_point2oct(group, point, form, buf, buf_len, ctx))
-		{
+	if (!EC_POINT_point2oct(group, point, form, buf, buf_len, ctx)) {
 		free(buf);
 		return NULL;
-		}
-
-	ret = (char *)malloc(buf_len*2+2);
-	if (ret == NULL)
-		{
+	}
+	ret = (char *) malloc(buf_len * 2 + 2);
+	if (ret == NULL) {
 		free(buf);
 		return NULL;
-		}
+	}
 	p = ret;
 	pbuf = buf;
-	for (i=buf_len; i > 0; i--)
-		{
-			int v = (int) *(pbuf++);
-			*(p++)=HEX_DIGITS[v>>4];
-			*(p++)=HEX_DIGITS[v&0x0F];
-		}
-	*p='\0';
+	for (i = buf_len; i > 0; i--) {
+		int v = (int) *(pbuf++);
+		*(p++) = HEX_DIGITS[v >> 4];
+		*(p++) = HEX_DIGITS[v & 0x0F];
+	}
+	*p = '\0';
 
 	free(buf);
 
 	return ret;
-	}
+}
 
-EC_POINT *EC_POINT_hex2point(const EC_GROUP *group,
-                             const char *buf,
-                             EC_POINT *point,
-                             BN_CTX *ctx)
-	{
-	EC_POINT *ret=NULL;
-	BIGNUM   *tmp_bn=NULL;
+EC_POINT *
+EC_POINT_hex2point(const EC_GROUP * group, const char *buf,
+    EC_POINT * point, BN_CTX * ctx)
+{
+	EC_POINT *ret = NULL;
+	BIGNUM *tmp_bn = NULL;
 
 	if (!BN_hex2bn(&tmp_bn, buf))
 		return NULL;
@@ -192,4 +175,4 @@ EC_POINT *EC_POINT_hex2point(const EC_GROUP *group,
 	BN_clear_free(tmp_bn);
 
 	return ret;
-	}
+}