Merge #397: Small fixes for sha256

3f8b78e Fix undefs in hash_impl.h (Kirill Fomichev) 2ab4695 Fix state size in sha256 struct (Kirill Fomichev)
9 years ago · 0172be92e5
parent 6875b013e6 3f8b78e5e9
commit 0172be92e5
2 changed files with 5 additions and 7 deletions
--- 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;
--- 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