j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use void pointers for opaque data blobs in the SHA512 code.

Browse source
This commit is contained in:
Guus Sliepen 2015-01-04 14:19:23 +01:00
parent 4b42518813
commit b737103a91
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ed25519/sha512.c
View file

@ -88,7 +88,7 @@ static const uint64_t K[80] = {
#endif #endif
/* compress 1024-bits */ /* compress 1024-bits */
static int sha512_compress(sha512_context *md, unsigned char *buf) static int sha512_compress(sha512_context *md, const unsigned char *buf)
{ {
uint64_t S[8], W[80], t0, t1; uint64_t S[8], W[80], t0, t1;
int i; int i;
@ -168,8 +168,9 @@ int sha512_init(sha512_context * md) {
@param inlen The length of the data (octets) @param inlen The length of the data (octets)
@return 0 if successful @return 0 if successful
*/ */
int sha512_update(sha512_context *md, const unsigned char *in, size_t inlen) int sha512_update(sha512_context *md, const void *vin, size_t inlen)
{ {
const unsigned char *in = vin;
size_t n; size_t n;
size_t i; size_t i;
int err; int err;
@ -180,7 +181,7 @@ int sha512_update(sha512_context *md, const unsigned char *in, size_t inlen)
} }
while (inlen > 0) { while (inlen > 0) {
if (md->curlen == 0 && inlen >= 128) { if (md->curlen == 0 && inlen >= 128) {
if ((err = sha512_compress (md, (unsigned char *)in)) != 0) { if ((err = sha512_compress (md, in)) != 0) {
return err; return err;
} }
md->length += 128 * 8; md->length += 128 * 8;
@ -215,9 +216,10 @@ int sha512_update(sha512_context *md, const unsigned char *in, size_t inlen)
@param out [out] The destination of the hash (64 bytes) @param out [out] The destination of the hash (64 bytes)
@return 0 if successful @return 0 if successful
*/ */
int sha512_final(sha512_context * md, unsigned char *out) int sha512_final(sha512_context * md, void *vout)
{ {
int i; int i;
unsigned char *out = vout;
if (md == NULL) return 1; if (md == NULL) return 1;
if (out == NULL) return 1; if (out == NULL) return 1;
@ -264,7 +266,7 @@ int sha512_final(sha512_context * md, unsigned char *out)
return 0; return 0;
} }
int sha512(const unsigned char *message, size_t message_len, unsigned char *out) int sha512(const void *message, size_t message_len, void *out)
{ {
sha512_context ctx; sha512_context ctx;
int ret; int ret;

6
src/ed25519/sha512.h
View file

@ -14,8 +14,8 @@ typedef struct sha512_context_ {
int sha512_init(sha512_context * md); int sha512_init(sha512_context * md);
int sha512_final(sha512_context * md, unsigned char *out); int sha512_final(sha512_context * md, void *out);
int sha512_update(sha512_context * md, const unsigned char *in, size_t inlen); int sha512_update(sha512_context * md, const void *in, size_t inlen);
int sha512(const unsigned char *message, size_t message_len, unsigned char *out); int sha512(const void *message, size_t message_len, void *out);
#endif #endif