1 files changed, 51 insertions, 44 deletions

diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c
index 479cff8fc9..60c4a2d790 100644
--- a/src/lib/libcrypto/ec/ecp_nist.c
+++ b/src/lib/libcrypto/ec/ecp_nist.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
@@ -81,20 +81,20 @@ EC_GFp_nist_method(void)
                 .group_get_curve = ec_GFp_simple_group_get_curve,
                 .group_get_degree = ec_GFp_simple_group_get_degree,
                 .group_check_discriminant =
-                    ec_GFp_simple_group_check_discriminant,
+                ec_GFp_simple_group_check_discriminant,
                 .point_init = ec_GFp_simple_point_init,
                 .point_finish = ec_GFp_simple_point_finish,
                 .point_clear_finish = ec_GFp_simple_point_clear_finish,
                 .point_copy = ec_GFp_simple_point_copy,
                 .point_set_to_infinity = ec_GFp_simple_point_set_to_infinity,
                 .point_set_Jprojective_coordinates_GFp =
-                    ec_GFp_simple_set_Jprojective_coordinates_GFp,
+                ec_GFp_simple_set_Jprojective_coordinates_GFp,
                 .point_get_Jprojective_coordinates_GFp =
-                    ec_GFp_simple_get_Jprojective_coordinates_GFp,
+                ec_GFp_simple_get_Jprojective_coordinates_GFp,
                 .point_set_affine_coordinates =
-                    ec_GFp_simple_point_set_affine_coordinates,
+                ec_GFp_simple_point_set_affine_coordinates,
                 .point_get_affine_coordinates =
-                    ec_GFp_simple_point_get_affine_coordinates,
+                ec_GFp_simple_point_get_affine_coordinates,
                 .add = ec_GFp_simple_add,
                 .dbl = ec_GFp_simple_dbl,
                 .invert = ec_GFp_simple_invert,
@@ -110,25 +110,29 @@ EC_GFp_nist_method(void)
         return &ret;
 }
 
-int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
-        {
+int 
+ec_GFp_nist_group_copy(EC_GROUP * dest, const EC_GROUP * src)
+{
         dest->field_mod_func = src->field_mod_func;
 
         return ec_GFp_simple_group_copy(dest, src);
-        }
+}
 
-int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-        const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-        {
+int 
+ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
+    const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+{
         int ret = 0;
         BN_CTX *new_ctx = NULL;
         BIGNUM *tmp_bn;
-        
+
         if (ctx == NULL)
-                if ((ctx = new_ctx = BN_CTX_new()) == NULL) return 0;
+                if ((ctx = new_ctx = BN_CTX_new()) == NULL)
+                        return 0;
 
         BN_CTX_start(ctx);
-        if ((tmp_bn = BN_CTX_get(ctx)) == NULL) goto err;
+        if ((tmp_bn = BN_CTX_get(ctx)) == NULL)
+                goto err;
 
         if (BN_ucmp(BN_get0_nist_prime_192(), p) == 0)
                 group->field_mod_func = BN_nist_mod_192;
@@ -140,69 +144,72 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
                 group->field_mod_func = BN_nist_mod_384;
         else if (BN_ucmp(BN_get0_nist_prime_521(), p) == 0)
                 group->field_mod_func = BN_nist_mod_521;
-        else
-                {
+        else {
                 ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_NIST_PRIME);
                 goto err;
-                }
+        }
 
         ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
 
- err:
+err:
         BN_CTX_end(ctx);
         if (new_ctx != NULL)
                 BN_CTX_free(new_ctx);
         return ret;
-        }
+}
 
 
-int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-        const BIGNUM *b, BN_CTX *ctx)
-        {
-        int     ret=0;
-        BN_CTX  *ctx_new=NULL;
+int 
+ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
+    const BIGNUM *b, BN_CTX *ctx)
+{
+        int ret = 0;
+        BN_CTX *ctx_new = NULL;
 
-        if (!group || !r || !a || !b)
-                {
+        if (!group || !r || !a || !b) {
                 ECerr(EC_F_EC_GFP_NIST_FIELD_MUL, ERR_R_PASSED_NULL_PARAMETER);
                 goto err;
-                }
+        }
         if (!ctx)
-                if ((ctx_new = ctx = BN_CTX_new()) == NULL) goto err;
+                if ((ctx_new = ctx = BN_CTX_new()) == NULL)
+                        goto err;
 
-        if (!BN_mul(r, a, b, ctx)) goto err;
+        if (!BN_mul(r, a, b, ctx))
+                goto err;
         if (!group->field_mod_func(r, r, &group->field, ctx))
                 goto err;
 
-        ret=1;
+        ret = 1;
 err:
         if (ctx_new)
                 BN_CTX_free(ctx_new);
         return ret;
-        }
+}
 
 
-int ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-        BN_CTX *ctx)
-        {
-        int     ret=0;
-        BN_CTX  *ctx_new=NULL;
+int 
+ec_GFp_nist_field_sqr(const EC_GROUP * group, BIGNUM * r, const BIGNUM * a,
+    BN_CTX * ctx)
+{
+        int ret = 0;
+        BN_CTX *ctx_new = NULL;
 
-        if (!group || !r || !a)
-                {
+        if (!group || !r || !a) {
                 ECerr(EC_F_EC_GFP_NIST_FIELD_SQR, EC_R_PASSED_NULL_PARAMETER);
                 goto err;
-                }
+        }
         if (!ctx)
-                if ((ctx_new = ctx = BN_CTX_new()) == NULL) goto err;
+                if ((ctx_new = ctx = BN_CTX_new()) == NULL)
+                        goto err;
 
-        if (!BN_sqr(r, a, ctx)) goto err;
+        if (!BN_sqr(r, a, ctx))
+                goto err;
         if (!group->field_mod_func(r, r, &group->field, ctx))
                 goto err;
 
-        ret=1;
+        ret = 1;
 err:
         if (ctx_new)
                 BN_CTX_free(ctx_new);
         return ret;
-        }
+}