Remove a strict aliasing issue with pre-computed curve448 constants

[openssl.git] / crypto / ec / curve448 / arch_32 / f_impl.h

diff --git a/crypto/ec/curve448/arch_32/f_impl.h b/crypto/ec/curve448/arch_32/f_impl.h
index 60b5347691c9a7a75b494d158827f17c3ce88f3e..217f9947e9b5f797f341a469e6e266b75b7b807e 100644 (file)
--- a/crypto/ec/curve448/arch_32/f_impl.h
+++ b/crypto/ec/curve448/arch_32/f_impl.h
@@ -9,18 +9,22 @@
  *
  * Originally written by Mike Hamburg
  */
-#define GF_HEADROOM 2
-#define LIMB(x) (x)&((1<<28)-1), (x)>>28
-#define FIELD_LITERAL(a,b,c,d,e,f,g,h) \
+
+#ifndef HEADER_ARCH_32_F_IMPL_H
+# define HEADER_ARCH_32_F_IMPL_H
+
+# define GF_HEADROOM 2
+# define LIMB(x) (x)&((1<<28)-1), (x)>>28
+# define FIELD_LITERAL(a,b,c,d,e,f,g,h) \
     {{LIMB(a),LIMB(b),LIMB(c),LIMB(d),LIMB(e),LIMB(f),LIMB(g),LIMB(h)}}
 
-#define LIMB_PLACE_VALUE(i) 28
+# define LIMB_PLACE_VALUE(i) 28
 
 void gf_add_RAW(gf out, const gf a, const gf b)
 {
     unsigned int i;
 
-    for (i = 0; i < sizeof(*out) / sizeof(out->limb[0]); i++) {
+    for (i = 0; i < NLIMBS; i++) {
         out->limb[i] = a->limb[i] + b->limb[i];
     }
 }
@@ -29,7 +33,7 @@ void gf_sub_RAW(gf out, const gf a, const gf b)
 {
     unsigned int i;
 
-    for (i = 0; i < sizeof(*out) / sizeof(out->limb[0]); i++) {
+    for (i = 0; i < NLIMBS; i++) {
         out->limb[i] = a->limb[i] - b->limb[i];
     }
 }
@@ -39,7 +43,7 @@ void gf_bias(gf a, int amt)
     unsigned int i;
     uint32_t co1 = ((1 << 28) - 1) * amt, co2 = co1 - amt;
 
-    for (i = 0; i < sizeof(*a) / sizeof(a->limb[0]); i++)
+    for (i = 0; i < NLIMBS; i++)
         a->limb[i] += (i == sizeof(*a) / sizeof(a->limb[0]) / 2) ? co2 : co1;
 }
 
@@ -54,3 +58,5 @@ void gf_weak_reduce(gf a)
         a->limb[i] = (a->limb[i] & mask) + (a->limb[i - 1] >> 28);
     a->limb[0] = (a->limb[0] & mask) + tmp;
 }
+
+#endif                  /* HEADER_ARCH_32_F_IMPL_H */