Manual formatting tweaks to Curve448 code

[openssl.git] / crypto / ec / curve448 / field.h

diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h
index dcc3cc638c1f3f8846587edea5a9ee6fafa889b3..ccf64da7a5e77da61c306994a73aba69f21be506 100644 (file)
--- a/crypto/ec/curve448/field.h
+++ b/crypto/ec/curve448/field.h
@@ -11,85 +11,90 @@
  */
 
 #ifndef __GF_H__
  */
 
 #ifndef __GF_H__

-#define __GF_H__
+# define __GF_H__

 
 

-#include "constant_time.h"
-#include "f_field.h"
-#include <string.h>
-    
-/** Square x, n times. */
-static ossl_inline void gf_sqrn (
-    gf_s *__restrict__ y,
-    const gf x,
-    int n
-) {
+# include "constant_time.h"
+# include "f_field.h"
+# include <string.h>
+
+/* Square x, n times. */
+static ossl_inline void gf_sqrn(gf_s * __restrict__ y, const gf x, int n)
+{

     gf tmp;
     gf tmp;

-    assert(n>0);
-    if (n&1) {
-        gf_sqr(y,x);
+    assert(n > 0);
+    if (n & 1) {
+        gf_sqr(y, x);

         n--;
     } else {
         n--;
     } else {

-        gf_sqr(tmp,x);
-        gf_sqr(y,tmp);
-        n-=2;
+        gf_sqr(tmp, x);
+        gf_sqr(y, tmp);
+        n -= 2;

     }
     }

-    for (; n; n-=2) {
-        gf_sqr(tmp,y);
-        gf_sqr(y,tmp);
+    for (; n; n -= 2) {
+        gf_sqr(tmp, y);
+        gf_sqr(y, tmp);

     }
 }
 
     }
 }
 

-#define gf_add_nr gf_add_RAW
+# define gf_add_nr gf_add_RAW

 
 

-/** Subtract mod p.  Bias by 2 and don't reduce  */
-static ossl_inline void gf_sub_nr ( gf c, const gf a, const gf b ) {
-    gf_sub_RAW(c,a,b);
+/* Subtract mod p.  Bias by 2 and don't reduce  */
+static ossl_inline void gf_sub_nr(gf c, const gf a, const gf b)
+{
+    gf_sub_RAW(c, a, b);

     gf_bias(c, 2);
     gf_bias(c, 2);

-    if (GF_HEADROOM < 3) gf_weak_reduce(c);
+    if (GF_HEADROOM < 3)
+        gf_weak_reduce(c);

 }
 
 }
 

-/** Subtract mod p. Bias by amt but don't reduce.  */
-static ossl_inline void gf_subx_nr ( gf c, const gf a, const gf b, int amt ) {
-    gf_sub_RAW(c,a,b);
+/* Subtract mod p. Bias by amt but don't reduce.  */
+static ossl_inline void gf_subx_nr(gf c, const gf a, const gf b, int amt)
+{
+    gf_sub_RAW(c, a, b);

     gf_bias(c, amt);
     gf_bias(c, amt);

-    if (GF_HEADROOM < amt+1) gf_weak_reduce(c);
+    if (GF_HEADROOM < amt + 1)
+        gf_weak_reduce(c);

 }
 
 }
 

-/** Mul by signed int.  Not constant-time WRT the sign of that int. */
-static ossl_inline void gf_mulw(gf c, const gf a, int32_t w) {
-    if (w>0) {
+/* Mul by signed int.  Not constant-time WRT the sign of that int. */
+static ossl_inline void gf_mulw(gf c, const gf a, int32_t w)
+{
+    if (w > 0) {

         gf_mulw_unsigned(c, a, w);
     } else {
         gf_mulw_unsigned(c, a, -w);
         gf_mulw_unsigned(c, a, w);
     } else {
         gf_mulw_unsigned(c, a, -w);

-        gf_sub(c,ZERO,c);
+        gf_sub(c, ZERO, c);

     }
 }
 
     }
 }
 

-/** Constant time, x = is_z ? z : y */
-static ossl_inline void gf_cond_sel(gf x, const gf y, const gf z, mask_t is_z) {
-    constant_time_select(x,y,z,sizeof(gf),is_z,0);
+/* Constant time, x = is_z ? z : y */
+static ossl_inline void gf_cond_sel(gf x, const gf y, const gf z, mask_t is_z)
+{
+    constant_time_select(x, y, z, sizeof(gf), is_z, 0);

 }
 
 }
 

-/** Constant time, if (neg) x=-x; */
-static ossl_inline void gf_cond_neg(gf x, mask_t neg) {
+/* Constant time, if (neg) x=-x; */
+static ossl_inline void gf_cond_neg(gf x, mask_t neg)
+{

     gf y;
     gf y;

-    gf_sub(y,ZERO,x);
-    gf_cond_sel(x,x,y,neg);
+    gf_sub(y, ZERO, x);
+    gf_cond_sel(x, x, y, neg);

 }
 
 }
 

-/** Constant time, if (swap) (x,y) = (y,x); */
-static ossl_inline void
-gf_cond_swap(gf x, gf_s *__restrict__ y, mask_t swap) {
-    constant_time_cond_swap(x,y,sizeof(gf_s),swap);
+/* Constant time, if (swap) (x,y) = (y,x); */
+static ossl_inline void gf_cond_swap(gf x, gf_s * __restrict__ y, mask_t swap)
+{
+    constant_time_cond_swap(x, y, sizeof(gf_s), swap);

 }
 
 }
 

-static ossl_inline void gf_mul_qnr(gf_s *__restrict__ out, const gf x) {
-    gf_sub(out,ZERO,x);
+static ossl_inline void gf_mul_qnr(gf_s * __restrict__ out, const gf x)
+{
+    gf_sub(out, ZERO, x);

 }
 
 }
 

-static ossl_inline void gf_div_qnr(gf_s *__restrict__ out, const gf x) {
-    gf_sub(out,ZERO,x);
+static ossl_inline void gf_div_qnr(gf_s * __restrict__ out, const gf x)
+{
+    gf_sub(out, ZERO, x);

 }
 
 }
 

-
-#endif /* __GF_H__ */
+#endif                          /* __GF_H__ */