Merge #366: ARM assembly implementation of field_10x26 inner (rebase of #173)

001f176 ARM assembly implementation of field_10x26 inner (Wladimir J. van der Laan)

diff --git a/src/hash.h b/src/hash.h
index 0ff01e63fa737af30aaae74a8f75fa322c8fc76f..fca98cab9f8315bd4fa5c165d9f8e2f16dc2a493 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 typedef struct {
-    uint32_t s[32];
+    uint32_t s[8];
     uint32_t buf[16]; /* In big endian */
     size_t bytes;
 } secp256k1_sha256_t;

diff --git a/src/hash_impl.h b/src/hash_impl.h
index ae55df6d8a29a97f3e442ceeb9f4aab0dc70dadb..b47e65f830a906fc0eb9ff7939d62966823202b1 100644 (file)
--- a/src/hash_impl.h
+++ b/src/hash_impl.h
@@ -269,15 +269,13 @@ static void secp256k1_rfc6979_hmac_sha256_finalize(secp256k1_rfc6979_hmac_sha256
     rng->retry = 0;
 }
 
-
+#undef BE32
 #undef Round
-#undef sigma0
 #undef sigma1
-#undef Sigma0
+#undef sigma0
 #undef Sigma1
-#undef Ch
+#undef Sigma0
 #undef Maj
-#undef ReadBE32
-#undef WriteBE32
+#undef Ch
 
 #endif