1 files changed, 62 insertions, 71 deletions

diff --git a/src/lib/libcrypto/ec/ec_oct.c b/src/lib/libcrypto/ec/ec_oct.c
index fd9db0798d..e0fb62fee2 100644
--- a/src/lib/libcrypto/ec/ec_oct.c
+++ b/src/lib/libcrypto/ec/ec_oct.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.
- * Binary polynomial ECC support in OpenSSL originally developed by 
+ * Binary polynomial ECC support in OpenSSL originally developed by
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -68,132 +68,123 @@
 
 #include "ec_lcl.h"
 
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
-        const BIGNUM *x, int y_bit, BN_CTX *ctx)
-        {
+int 
+EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP * group, EC_POINT * point,
+    const BIGNUM * x, int y_bit, BN_CTX * ctx)
+{
         if (group->meth->point_set_compressed_coordinates == 0
-                && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
-                {
+            && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
                 ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return 0;
-                }
-        if (group->meth != point->meth)
-                {
+        }
+        if (group->meth != point->meth) {
                 ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
                 return 0;
-                }
-        if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
-                {
+        }
+        if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
                 if (group->meth->field_type == NID_X9_62_prime_field)
                         return ec_GFp_simple_set_compressed_coordinates(
-                                        group, point, x, y_bit, ctx);
+                            group, point, x, y_bit, ctx);
                 else
 #ifdef OPENSSL_NO_EC2M
-                        {
+                {
                         ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_GF2M_NOT_SUPPORTED);
                         return 0;
-                        }
+                }
 #else
                         return ec_GF2m_simple_set_compressed_coordinates(
-                                        group, point, x, y_bit, ctx);
+                            group, point, x, y_bit, ctx);
 #endif
-                }
-        return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
         }
+        return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
+}
 
 #ifndef OPENSSL_NO_EC2M
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
-        const BIGNUM *x, int y_bit, BN_CTX *ctx)
-        {
+int 
+EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP * group, EC_POINT * point,
+    const BIGNUM * x, int y_bit, BN_CTX * ctx)
+{
         if (group->meth->point_set_compressed_coordinates == 0
-                && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
-                {
+            && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
                 ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return 0;
-                }
-        if (group->meth != point->meth)
-                {
+        }
+        if (group->meth != point->meth) {
                 ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS);
                 return 0;
-                }
-        if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
-                {
+        }
+        if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
                 if (group->meth->field_type == NID_X9_62_prime_field)
                         return ec_GFp_simple_set_compressed_coordinates(
-                                        group, point, x, y_bit, ctx);
+                            group, point, x, y_bit, ctx);
                 else
                         return ec_GF2m_simple_set_compressed_coordinates(
-                                        group, point, x, y_bit, ctx);
-                }
-        return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
+                            group, point, x, y_bit, ctx);
         }
+        return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
+}
 #endif
 
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-        unsigned char *buf, size_t len, BN_CTX *ctx)
-        {
+size_t 
+EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
+    point_conversion_form_t form,
+    unsigned char *buf, size_t len, BN_CTX *ctx)
+{
         if (group->meth->point2oct == 0
-                && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
-                {
+            && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
                 ECerr(EC_F_EC_POINT_POINT2OCT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return 0;
-                }
-        if (group->meth != point->meth)
-                {
+        }
+        if (group->meth != point->meth) {
                 ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_INCOMPATIBLE_OBJECTS);
                 return 0;
-                }
-        if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
-                {
+        }
+        if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
                 if (group->meth->field_type == NID_X9_62_prime_field)
                         return ec_GFp_simple_point2oct(group, point,
-                                                        form, buf, len, ctx);
+                            form, buf, len, ctx);
                 else
 #ifdef OPENSSL_NO_EC2M
-                        {
+                {
                         ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_GF2M_NOT_SUPPORTED);
                         return 0;
-                        }
+                }
 #else
                         return ec_GF2m_simple_point2oct(group, point,
-                                                        form, buf, len, ctx);
+                            form, buf, len, ctx);
 #endif
-                }
-                        
-        return group->meth->point2oct(group, point, form, buf, len, ctx);
         }
+        return group->meth->point2oct(group, point, form, buf, len, ctx);
+}
 
 
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
-        const unsigned char *buf, size_t len, BN_CTX *ctx)
-        {
-        if (group->meth->oct2point == 0
-                && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
-                {
+int 
+EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
+    const unsigned char *buf, size_t len, BN_CTX *ctx)
+{
+        if (group->meth->oct2point == 0 &&
+            !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
                 ECerr(EC_F_EC_POINT_OCT2POINT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return 0;
-                }
-        if (group->meth != point->meth)
-                {
+        }
+        if (group->meth != point->meth) {
                 ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_INCOMPATIBLE_OBJECTS);
                 return 0;
-                }
-        if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
-                {
+        }
+        if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
                 if (group->meth->field_type == NID_X9_62_prime_field)
                         return ec_GFp_simple_oct2point(group, point,
-                                                        buf, len, ctx);
+                            buf, len, ctx);
                 else
 #ifdef OPENSSL_NO_EC2M
-                        {
+                {
                         ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_GF2M_NOT_SUPPORTED);
                         return 0;
-                        }
+                }
 #else
                         return ec_GF2m_simple_oct2point(group, point,
-                                                        buf, len, ctx);
+                            buf, len, ctx);
 #endif
-                }
-        return group->meth->oct2point(group, point, buf, len, ctx);
         }
-
+        return group->meth->oct2point(group, point, buf, len, ctx);
+}