sha256: Move 'bytes' to the end of sha256_ctx and make it a size_t

[ccan] / ccan / crypto / sha256 / sha256.h

diff --git a/ccan/crypto/sha256/sha256.h b/ccan/crypto/sha256/sha256.h
index 1297c41f48f0fabbc9bfda41c9dd93627e0c1858..fc5af21b8b9628065e6318e4ae09e32abccc53b7 100644 (file)
--- a/ccan/crypto/sha256/sha256.h
+++ b/ccan/crypto/sha256/sha256.h
@@ -45,11 +45,11 @@ struct sha256_ctx {
        SHA256_CTX c;
 #else
        uint32_t s[8];
        SHA256_CTX c;
 #else
        uint32_t s[8];

-       uint64_t bytes;

        union {
                uint32_t u32[16];
                unsigned char u8[64];
        } buf;
        union {
                uint32_t u32[16];
                unsigned char u8[64];
        } buf;

+       size_t bytes;

 #endif
 };
 
 #endif
 };
 


@@ -104,7 +104,8 @@ void sha256_init(struct sha256_ctx *ctx);
 #else
 #define SHA256_INIT                                                    \
        { { 0x6a09e667ul, 0xbb67ae85ul, 0x3c6ef372ul, 0xa54ff53aul,     \
 #else
 #define SHA256_INIT                                                    \
        { { 0x6a09e667ul, 0xbb67ae85ul, 0x3c6ef372ul, 0xa54ff53aul,     \

-           0x510e527ful, 0x9b05688cul, 0x1f83d9abul, 0x5be0cd19ul }, 0 }
+           0x510e527ful, 0x9b05688cul, 0x1f83d9abul, 0x5be0cd19ul },   \
+         { { 0 } }, 0 }

 #endif
 
 /**
 #endif
 
 /**