knf approximation

1 files changed, 107 insertions, 113 deletions

diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index 6b5b856344..ececbe56dd 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.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
@@ -80,20 +80,20 @@ EC_GFp_mont_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,
@@ -113,123 +113,119 @@ EC_GFp_mont_method(void)
 }
 
 
-int ec_GFp_mont_group_init(EC_GROUP *group)
-        {
+int 
+ec_GFp_mont_group_init(EC_GROUP * group)
+{
         int ok;
 
         ok = ec_GFp_simple_group_init(group);
         group->field_data1 = NULL;
         group->field_data2 = NULL;
         return ok;
-        }
+}
 
 
-void ec_GFp_mont_group_finish(EC_GROUP *group)
-        {
-        if (group->field_data1 != NULL)
-                {
+void 
+ec_GFp_mont_group_finish(EC_GROUP * group)
+{
+        if (group->field_data1 != NULL) {
                 BN_MONT_CTX_free(group->field_data1);
                 group->field_data1 = NULL;
-                }
-        if (group->field_data2 != NULL)
-                {
+        }
+        if (group->field_data2 != NULL) {
                 BN_free(group->field_data2);
                 group->field_data2 = NULL;
-                }
-        ec_GFp_simple_group_finish(group);
         }
+        ec_GFp_simple_group_finish(group);
+}
 
 
-void ec_GFp_mont_group_clear_finish(EC_GROUP *group)
-        {
-        if (group->field_data1 != NULL)
-                {
+void 
+ec_GFp_mont_group_clear_finish(EC_GROUP * group)
+{
+        if (group->field_data1 != NULL) {
                 BN_MONT_CTX_free(group->field_data1);
                 group->field_data1 = NULL;
-                }
-        if (group->field_data2 != NULL)
-                {
+        }
+        if (group->field_data2 != NULL) {
                 BN_clear_free(group->field_data2);
                 group->field_data2 = NULL;
-                }
-        ec_GFp_simple_group_clear_finish(group);
         }
+        ec_GFp_simple_group_clear_finish(group);
+}
 
 
-int ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
-        {
-        if (dest->field_data1 != NULL)
-                {
+int 
+ec_GFp_mont_group_copy(EC_GROUP * dest, const EC_GROUP * src)
+{
+        if (dest->field_data1 != NULL) {
                 BN_MONT_CTX_free(dest->field_data1);
                 dest->field_data1 = NULL;
-                }
-        if (dest->field_data2 != NULL)
-                {
+        }
+        if (dest->field_data2 != NULL) {
                 BN_clear_free(dest->field_data2);
                 dest->field_data2 = NULL;
-                }
-
-        if (!ec_GFp_simple_group_copy(dest, src)) return 0;
+        }
+        if (!ec_GFp_simple_group_copy(dest, src))
+                return 0;
 
-        if (src->field_data1 != NULL)
-                {
+        if (src->field_data1 != NULL) {
                 dest->field_data1 = BN_MONT_CTX_new();
-                if (dest->field_data1 == NULL) return 0;
-                if (!BN_MONT_CTX_copy(dest->field_data1, src->field_data1)) goto err;
-                }
-        if (src->field_data2 != NULL)
-                {
+                if (dest->field_data1 == NULL)
+                        return 0;
+                if (!BN_MONT_CTX_copy(dest->field_data1, src->field_data1))
+                        goto err;
+        }
+        if (src->field_data2 != NULL) {
                 dest->field_data2 = BN_dup(src->field_data2);
-                if (dest->field_data2 == NULL) goto err;
-                }
-
+                if (dest->field_data2 == NULL)
+                        goto err;
+        }
         return 1;
 
- err:
-        if (dest->field_data1 != NULL)
-                {
+err:
+        if (dest->field_data1 != NULL) {
                 BN_MONT_CTX_free(dest->field_data1);
                 dest->field_data1 = NULL;
-                }
-        return 0;       
         }
+        return 0;
+}
 
 
-int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-        {
+int 
+ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
+    const BIGNUM *b, BN_CTX *ctx)
+{
         BN_CTX *new_ctx = NULL;
         BN_MONT_CTX *mont = NULL;
         BIGNUM *one = NULL;
         int ret = 0;
 
-        if (group->field_data1 != NULL)
-                {
+        if (group->field_data1 != NULL) {
                 BN_MONT_CTX_free(group->field_data1);
                 group->field_data1 = NULL;
-                }
-        if (group->field_data2 != NULL)
-                {
+        }
+        if (group->field_data2 != NULL) {
                 BN_free(group->field_data2);
                 group->field_data2 = NULL;
-                }
-        
-        if (ctx == NULL)
-                {
+        }
+        if (ctx == NULL) {
                 ctx = new_ctx = BN_CTX_new();
                 if (ctx == NULL)
                         return 0;
-                }
-
+        }
         mont = BN_MONT_CTX_new();
-        if (mont == NULL) goto err;
-        if (!BN_MONT_CTX_set(mont, p, ctx))
-                {
+        if (mont == NULL)
+                goto err;
+        if (!BN_MONT_CTX_set(mont, p, ctx)) {
                 ECerr(EC_F_EC_GFP_MONT_GROUP_SET_CURVE, ERR_R_BN_LIB);
                 goto err;
-                }
+        }
         one = BN_new();
-        if (one == NULL) goto err;
-        if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) goto err;
+        if (one == NULL)
+                goto err;
+        if (!BN_to_montgomery(one, BN_value_one(), mont, ctx))
+                goto err;
 
         group->field_data1 = mont;
         mont = NULL;
@@ -238,79 +234,77 @@ int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *
 
         ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
 
-        if (!ret)
-                {
+        if (!ret) {
                 BN_MONT_CTX_free(group->field_data1);
                 group->field_data1 = NULL;
                 BN_free(group->field_data2);
                 group->field_data2 = NULL;
-                }
-
- err:
+        }
+err:
         if (new_ctx != NULL)
                 BN_CTX_free(new_ctx);
         if (mont != NULL)
                 BN_MONT_CTX_free(mont);
         return ret;
-        }
+}
 
 
-int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-        {
-        if (group->field_data1 == NULL)
-                {
+int 
+ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
+    const BIGNUM *b, BN_CTX *ctx)
+{
+        if (group->field_data1 == NULL) {
                 ECerr(EC_F_EC_GFP_MONT_FIELD_MUL, EC_R_NOT_INITIALIZED);
                 return 0;
-                }
-
-        return BN_mod_mul_montgomery(r, a, b, group->field_data1, ctx);
         }
+        return BN_mod_mul_montgomery(r, a, b, group->field_data1, ctx);
+}
 
 
-int ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
-        {
-        if (group->field_data1 == NULL)
-                {
+int 
+ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
+    BN_CTX *ctx)
+{
+        if (group->field_data1 == NULL) {
                 ECerr(EC_F_EC_GFP_MONT_FIELD_SQR, EC_R_NOT_INITIALIZED);
                 return 0;
-                }
-
-        return BN_mod_mul_montgomery(r, a, a, group->field_data1, ctx);
         }
+        return BN_mod_mul_montgomery(r, a, a, group->field_data1, ctx);
+}
 
 
-int ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
-        {
-        if (group->field_data1 == NULL)
-                {
+int 
+ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
+    BN_CTX *ctx)
+{
+        if (group->field_data1 == NULL) {
                 ECerr(EC_F_EC_GFP_MONT_FIELD_ENCODE, EC_R_NOT_INITIALIZED);
                 return 0;
-                }
-
-        return BN_to_montgomery(r, a, (BN_MONT_CTX *)group->field_data1, ctx);
         }
+        return BN_to_montgomery(r, a, (BN_MONT_CTX *) group->field_data1, ctx);
+}
 
 
-int ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
-        {
-        if (group->field_data1 == NULL)
-                {
+int 
+ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
+    BN_CTX *ctx)
+{
+        if (group->field_data1 == NULL) {
                 ECerr(EC_F_EC_GFP_MONT_FIELD_DECODE, EC_R_NOT_INITIALIZED);
                 return 0;
-                }
-
-        return BN_from_montgomery(r, a, group->field_data1, ctx);
         }
+        return BN_from_montgomery(r, a, group->field_data1, ctx);
+}
 
 
-int ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx)
-        {
-        if (group->field_data2 == NULL)
-                {
+int 
+ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx)
+{
+        if (group->field_data2 == NULL) {
                 ECerr(EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE, EC_R_NOT_INITIALIZED);
                 return 0;
-                }
-
-        if (!BN_copy(r, group->field_data2)) return 0;
-        return 1;
         }
+        if (!BN_copy(r, group->field_data2))
+                return 0;
+        return 1;
+}