1 files changed, 133 insertions, 157 deletions

diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c
index 4e8c748bbc..86107d5142 100644
--- a/src/lib/libcrypto/ec/eck_prn.c
+++ b/src/lib/libcrypto/ec/eck_prn.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
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions originally developed by SUN MICROSYSTEMS, INC., and 
+ * Portions originally developed by SUN MICROSYSTEMS, INC., and
  * contributed to the OpenSSL project.
  */
 
@@ -68,113 +68,112 @@
 #include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_FP_API
-int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off)
-        {
+int 
+ECPKParameters_print_fp(FILE * fp, const EC_GROUP * x, int off)
+{
         BIO *b;
         int ret;
 
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                ECerr(EC_F_ECPKPARAMETERS_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
+        if ((b = BIO_new(BIO_s_file())) == NULL) {
+                ECerr(EC_F_ECPKPARAMETERS_PRINT_FP, ERR_R_BUF_LIB);
+                return (0);
+        }
         BIO_set_fp(b, fp, BIO_NOCLOSE);
         ret = ECPKParameters_print(b, x, off);
         BIO_free(b);
-        return(ret);
-        }
+        return (ret);
+}
 
-int EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off)
-        {
+int 
+EC_KEY_print_fp(FILE * fp, const EC_KEY * x, int off)
+{
         BIO *b;
         int ret;
- 
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
+
+        if ((b = BIO_new(BIO_s_file())) == NULL) {
                 ECerr(EC_F_EC_KEY_PRINT_FP, ERR_R_BIO_LIB);
-                return(0);
-                }
+                return (0);
+        }
         BIO_set_fp(b, fp, BIO_NOCLOSE);
         ret = EC_KEY_print(b, x, off);
         BIO_free(b);
-        return(ret);
-        }
+        return (ret);
+}
 
-int ECParameters_print_fp(FILE *fp, const EC_KEY *x)
-        {
+int 
+ECParameters_print_fp(FILE * fp, const EC_KEY * x)
+{
         BIO *b;
         int ret;
- 
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
+
+        if ((b = BIO_new(BIO_s_file())) == NULL) {
                 ECerr(EC_F_ECPARAMETERS_PRINT_FP, ERR_R_BIO_LIB);
-                return(0);
-                }
+                return (0);
+        }
         BIO_set_fp(b, fp, BIO_NOCLOSE);
         ret = ECParameters_print(b, x);
         BIO_free(b);
-        return(ret);
-        }
+        return (ret);
+}
 #endif
 
-int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
-        {
+int 
+EC_KEY_print(BIO * bp, const EC_KEY * x, int off)
+{
         EVP_PKEY *pk;
         int ret;
         pk = EVP_PKEY_new();
-        if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x))
+        if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *) x))
                 return 0;
         ret = EVP_PKEY_print_private(bp, pk, off, NULL);
         EVP_PKEY_free(pk);
         return ret;
-        }
+}
 
-int ECParameters_print(BIO *bp, const EC_KEY *x)
-        {
+int 
+ECParameters_print(BIO * bp, const EC_KEY * x)
+{
         EVP_PKEY *pk;
         int ret;
         pk = EVP_PKEY_new();
-        if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)x))
+        if (!pk || !EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *) x))
                 return 0;
         ret = EVP_PKEY_print_params(bp, pk, 4, NULL);
         EVP_PKEY_free(pk);
         return ret;
-        }
-
-static int print_bin(BIO *fp, const char *str, const unsigned char *num,
-                size_t len, int off);
-
-int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
-        {
-        unsigned char *buffer=NULL;
-        size_t  buf_len=0, i;
-        int     ret=0, reason=ERR_R_BIO_LIB;
-        BN_CTX  *ctx=NULL;
-        const EC_POINT *point=NULL;
-        BIGNUM  *p=NULL, *a=NULL, *b=NULL, *gen=NULL,
-                *order=NULL, *cofactor=NULL;
+}
+
+static int 
+print_bin(BIO * fp, const char *str, const unsigned char *num,
+    size_t len, int off);
+
+int 
+ECPKParameters_print(BIO * bp, const EC_GROUP * x, int off)
+{
+        unsigned char *buffer = NULL;
+        size_t buf_len = 0, i;
+        int ret = 0, reason = ERR_R_BIO_LIB;
+        BN_CTX *ctx = NULL;
+        const EC_POINT *point = NULL;
+        BIGNUM *p = NULL, *a = NULL, *b = NULL, *gen = NULL, *order = NULL,
+        *cofactor = NULL;
         const unsigned char *seed;
-        size_t  seed_len=0;
-        
+        size_t seed_len = 0;
+
         static const char *gen_compressed = "Generator (compressed):";
         static const char *gen_uncompressed = "Generator (uncompressed):";
         static const char *gen_hybrid = "Generator (hybrid):";
- 
-        if (!x)
-                {
+
+        if (!x) {
                 reason = ERR_R_PASSED_NULL_PARAMETER;
                 goto err;
-                }
-
+        }
         ctx = BN_CTX_new();
-        if (ctx == NULL)
-                {
+        if (ctx == NULL) {
                 reason = ERR_R_MALLOC_FAILURE;
                 goto err;
-                }
-
-        if (EC_GROUP_get_asn1_flag(x))
-                {
+        }
+        if (EC_GROUP_get_asn1_flag(x)) {
                 /* the curve parameter are given by an asn1 OID */
                 int nid;
 
@@ -189,9 +188,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                         goto err;
                 if (BIO_printf(bp, "\n") <= 0)
                         goto err;
-                }
-        else
-                {
+        } else {
                 /* explicit parameters */
                 int is_char_two = 0;
                 point_conversion_form_t form;
@@ -201,84 +198,71 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                         is_char_two = 1;
 
                 if ((p = BN_new()) == NULL || (a = BN_new()) == NULL ||
-                        (b = BN_new()) == NULL || (order = BN_new()) == NULL ||
-                        (cofactor = BN_new()) == NULL)
-                        {
+                    (b = BN_new()) == NULL || (order = BN_new()) == NULL ||
+                    (cofactor = BN_new()) == NULL) {
                         reason = ERR_R_MALLOC_FAILURE;
                         goto err;
-                        }
+                }
 #ifndef OPENSSL_NO_EC2M
-                if (is_char_two)
-                        {
-                        if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx))
-                                {
+                if (is_char_two) {
+                        if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx)) {
                                 reason = ERR_R_EC_LIB;
                                 goto err;
-                                }
                         }
-                else /* prime field */
+                } else          /* prime field */
 #endif
-                        {
-                        if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx))
-                                {
+                {
+                        if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx)) {
                                 reason = ERR_R_EC_LIB;
                                 goto err;
-                                }
                         }
+                }
 
-                if ((point = EC_GROUP_get0_generator(x)) == NULL)
-                        {
+                if ((point = EC_GROUP_get0_generator(x)) == NULL) {
                         reason = ERR_R_EC_LIB;
                         goto err;
-                        }
-                if (!EC_GROUP_get_order(x, order, NULL) || 
-                        !EC_GROUP_get_cofactor(x, cofactor, NULL))
-                        {
+                }
+                if (!EC_GROUP_get_order(x, order, NULL) ||
+                    !EC_GROUP_get_cofactor(x, cofactor, NULL)) {
                         reason = ERR_R_EC_LIB;
                         goto err;
-                        }
-                
+                }
                 form = EC_GROUP_get_point_conversion_form(x);
 
-                if ((gen = EC_POINT_point2bn(x, point, 
-                                form, NULL, ctx)) == NULL)
-                        {
+                if ((gen = EC_POINT_point2bn(x, point,
+                            form, NULL, ctx)) == NULL) {
                         reason = ERR_R_EC_LIB;
                         goto err;
-                        }
-
-                buf_len = (size_t)BN_num_bytes(p);
-                if (buf_len < (i = (size_t)BN_num_bytes(a)))
+                }
+                buf_len = (size_t) BN_num_bytes(p);
+                if (buf_len < (i = (size_t) BN_num_bytes(a)))
                         buf_len = i;
-                if (buf_len < (i = (size_t)BN_num_bytes(b)))
+                if (buf_len < (i = (size_t) BN_num_bytes(b)))
                         buf_len = i;
-                if (buf_len < (i = (size_t)BN_num_bytes(gen)))
+                if (buf_len < (i = (size_t) BN_num_bytes(gen)))
                         buf_len = i;
-                if (buf_len < (i = (size_t)BN_num_bytes(order)))
+                if (buf_len < (i = (size_t) BN_num_bytes(order)))
                         buf_len = i;
-                if (buf_len < (i = (size_t)BN_num_bytes(cofactor))) 
+                if (buf_len < (i = (size_t) BN_num_bytes(cofactor)))
                         buf_len = i;
 
                 if ((seed = EC_GROUP_get0_seed(x)) != NULL)
                         seed_len = EC_GROUP_get_seed_len(x);
 
                 buf_len += 10;
-                if ((buffer = malloc(buf_len)) == NULL)
-                        {
+                if ((buffer = malloc(buf_len)) == NULL) {
                         reason = ERR_R_MALLOC_FAILURE;
                         goto err;
-                        }
-
+                }
                 if (!BIO_indent(bp, off, 128))
                         goto err;
 
                 /* print the 'short name' of the field type */
                 if (BIO_printf(bp, "Field Type: %s\n", OBJ_nid2sn(tmp_nid))
-                        <= 0)
-                        goto err;  
+                    <= 0)
+                        goto err;
 
-                if (is_char_two)
-                        {
+                if (is_char_two) {
                         /* print the 'short name' of the base type OID */
                         int basis_type = EC_GROUP_get_basis_type(x);
                         if (basis_type == 0)
@@ -287,7 +271,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                         if (!BIO_indent(bp, off, 128))
                                 goto err;
 
-                        if (BIO_printf(bp, "Basis Type: %s\n", 
+                        if (BIO_printf(bp, "Basis Type: %s\n",
                                 OBJ_nid2sn(basis_type)) <= 0)
                                 goto err;
 
@@ -295,48 +279,43 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                         if ((p != NULL) && !ASN1_bn_print(bp, "Polynomial:", p, buffer,
                                 off))
                                 goto err;
-                        }
-                else
-                        {
-                        if ((p != NULL) && !ASN1_bn_print(bp, "Prime:", p, buffer,off))
+                } else {
+                        if ((p != NULL) && !ASN1_bn_print(bp, "Prime:", p, buffer, off))
                                 goto err;
-                        }
-                if ((a != NULL) && !ASN1_bn_print(bp, "A:   ", a, buffer, off)) 
+                }
+                if ((a != NULL) && !ASN1_bn_print(bp, "A:   ", a, buffer, off))
                         goto err;
                 if ((b != NULL) && !ASN1_bn_print(bp, "B:   ", b, buffer, off))
                         goto err;
-                if (form == POINT_CONVERSION_COMPRESSED)
-                        {
+                if (form == POINT_CONVERSION_COMPRESSED) {
                         if ((gen != NULL) && !ASN1_bn_print(bp, gen_compressed, gen,
                                 buffer, off))
                                 goto err;
-                        }
-                else if (form == POINT_CONVERSION_UNCOMPRESSED)
-                        {
+                } else if (form == POINT_CONVERSION_UNCOMPRESSED) {
                         if ((gen != NULL) && !ASN1_bn_print(bp, gen_uncompressed, gen,
                                 buffer, off))
                                 goto err;
-                        }
-                else /* form == POINT_CONVERSION_HYBRID */
-                        {
+                } else {        /* form == POINT_CONVERSION_HYBRID */
                         if ((gen != NULL) && !ASN1_bn_print(bp, gen_hybrid, gen,
                                 buffer, off))
                                 goto err;
-                        }
-                if ((order != NULL) && !ASN1_bn_print(bp, "Order: ", order, 
-                        buffer, off)) goto err;
-                if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor, 
-                        buffer, off)) goto err;
+                }
+                if ((order != NULL) && !ASN1_bn_print(bp, "Order: ", order,
+                        buffer, off))
+                        goto err;
+                if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor,
+                        buffer, off))
+                        goto err;
                 if (seed && !print_bin(bp, "Seed:", seed, seed_len, off))
                         goto err;
-                }
-        ret=1;
+        }
+        ret = 1;
 err:
         if (!ret)
-                ECerr(EC_F_ECPKPARAMETERS_PRINT, reason);
-        if (p) 
+                ECerr(EC_F_ECPKPARAMETERS_PRINT, reason);
+        if (p)
                 BN_free(p);
-        if (a) 
+        if (a)
                 BN_free(a);
         if (b)
                 BN_free(b);
@@ -348,45 +327,42 @@ err:
                 BN_free(cofactor);
         if (ctx)
                 BN_CTX_free(ctx);
-        if (buffer != NULL) 
+        if (buffer != NULL)
                 free(buffer);
-        return(ret);    
-        }
+        return (ret);
+}
 
-static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
-                size_t len, int off)
-        {
+static int 
+print_bin(BIO * fp, const char *name, const unsigned char *buf,
+    size_t len, int off)
+{
         size_t i;
         char str[128];
 
         if (buf == NULL)
                 return 1;
-        if (off)
-                {
+        if (off) {
                 if (off > 128)
-                        off=128;
-                memset(str,' ',off);
+                        off = 128;
+                memset(str, ' ', off);
                 if (BIO_write(fp, str, off) <= 0)
                         return 0;
-                }
-
-        if (BIO_printf(fp,"%s", name) <= 0)
+        }
+        if (BIO_printf(fp, "%s", name) <= 0)
                 return 0;
 
-        for (i=0; i<len; i++)
-                {
-                if ((i%15) == 0)
-                        {
-                        str[0]='\n';
-                        memset(&(str[1]),' ',off+4);
-                        if (BIO_write(fp, str, off+1+4) <= 0)
+        for (i = 0; i < len; i++) {
+                if ((i % 15) == 0) {
+                        str[0] = '\n';
+                        memset(&(str[1]), ' ', off + 4);
+                        if (BIO_write(fp, str, off + 1 + 4) <= 0)
                                 return 0;
-                        }
-                if (BIO_printf(fp,"%02x%s",buf[i],((i+1) == len)?"":":") <= 0)
-                        return 0;
                 }
-        if (BIO_write(fp,"\n",1) <= 0)
+                if (BIO_printf(fp, "%02x%s", buf[i], ((i + 1) == len) ? "" : ":") <= 0)
+                        return 0;
+        }
+        if (BIO_write(fp, "\n", 1) <= 0)
                 return 0;
 
         return 1;
-        }
+}