projects
/
ccan
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 812091a3283069282beaaee03e6098053523fec6..fc5af21b8b9628065e6318e4ae09e32abccc53b7 100644
(file)
--- a/
ccan/crypto/sha256/sha256.h
+++ b/
ccan/crypto/sha256/sha256.h
@@
-21,23
+21,21
@@
*/
struct sha256 {
union {
*/
struct sha256 {
union {
- /* Array of chars */
- unsigned char u8[32];
- /* Array of uint32_t */
uint32_t u32[8];
uint32_t u32[8];
+ unsigned char u8[32];
} u;
};
/**
} u;
};
/**
- * sha256 - return sha256 of an
array of bytes
.
+ * sha256 - return sha256 of an
object
.
* @sha256: the sha256 to fill in
* @sha256: the sha256 to fill in
- * @p:
array or pointer to first element
- * @
num: the number of elements to hash
+ * @p:
pointer to memory,
+ * @
size: the number of bytes pointed to by @p
*
*
- * The bytes pointed to by @p is SHA256 hashe
s
into @sha256. This is
+ * The bytes pointed to by @p is SHA256 hashe
d
into @sha256. This is
* equivalent to sha256_init(), sha256_update() then sha256_done().
*/
* equivalent to sha256_init(), sha256_update() then sha256_done().
*/
-#define sha256(sha256, p, num) sha256_arr((sha256), (p), (num), sizeof(*(p)))
+void sha256(struct sha256 *sha, const void *p, size_t size);
/**
* struct sha256_ctx - structure to store running context for sha256
/**
* struct sha256_ctx - structure to store running context for sha256
@@
-47,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 {
union {
- uint32_t u32[
8
];
+ uint32_t u32[
16
];
unsigned char u8[64];
} buf;
unsigned char u8[64];
} buf;
+ size_t bytes;
#endif
};
#endif
};
@@
-106,20
+104,20
@@
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
/**
- * sha256_update - include
an array of data
in the hash.
+ * sha256_update - include
some memory
in the hash.
* @ctx: the sha256_ctx to use
* @ctx: the sha256_ctx to use
- * @p:
array or pointer to first element
- * @
num: the number of elements to hash
+ * @p:
pointer to memory,
+ * @
size: the number of bytes pointed to by @p
*
* You can call this multiple times to hash more data, before calling
* sha256_done().
*/
*
* You can call this multiple times to hash more data, before calling
* sha256_done().
*/
-#define sha256_update(ctx, p, num) \
- sha256_update_arr((ctx), (p), (num), sizeof(*(p)))
+void sha256_update(struct sha256_ctx *ctx, const void *p, size_t size);
/**
* sha256_done - finish SHA256 and return the hash
/**
* sha256_done - finish SHA256 and return the hash
@@
-146,8
+144,4
@@
void sha256_le64(struct sha256_ctx *ctx, uint64_t v);
void sha256_be16(struct sha256_ctx *ctx, uint16_t v);
void sha256_be32(struct sha256_ctx *ctx, uint32_t v);
void sha256_be64(struct sha256_ctx *ctx, uint64_t v);
void sha256_be16(struct sha256_ctx *ctx, uint16_t v);
void sha256_be32(struct sha256_ctx *ctx, uint32_t v);
void sha256_be64(struct sha256_ctx *ctx, uint64_t v);
-
-void sha256_update_arr(struct sha256_ctx *ctx, const void *p,
- size_t num, size_t size);
-void sha256_arr(struct sha256 *sha, const void *p, size_t num, size_t size);
#endif /* CCAN_CRYPTO_SHA256_H */
#endif /* CCAN_CRYPTO_SHA256_H */