Use unsigned char

This commit is contained in:
angt
2016-04-26 06:34:48 +00:00
parent 782329b7db
commit 3b7853c9ba

16
mud.c
View File

@@ -127,13 +127,13 @@ struct queue {
struct crypto { struct crypto {
uint64_t time; uint64_t time;
uint8_t secret[crypto_scalarmult_SCALARBYTES]; unsigned char secret[crypto_scalarmult_SCALARBYTES];
uint8_t shared[crypto_scalarmult_BYTES]; unsigned char shared[crypto_scalarmult_BYTES];
uint8_t key[MUD_KEY_SIZE]; unsigned char key[MUD_KEY_SIZE];
uint8_t old_key[MUD_KEY_SIZE]; unsigned char old_key[MUD_KEY_SIZE];
struct { struct {
uint8_t public[crypto_scalarmult_BYTES]; unsigned char public[crypto_scalarmult_BYTES];
uint8_t key[MUD_KEY_SIZE]; unsigned char key[MUD_KEY_SIZE];
} send, recv; } send, recv;
}; };
@@ -736,7 +736,7 @@ int mud_decrypt (struct mud *mud, uint64_t *nonce,
memcpy(npub, src, MUD_NPUB_SIZE); memcpy(npub, src, MUD_NPUB_SIZE);
memcpy(dst, src+MUD_NPUB_SIZE, ad_size); memcpy(dst, src+MUD_NPUB_SIZE, ad_size);
uint8_t *keys[] = { unsigned char *keys[] = {
mud->crypto.key, mud->crypto.key,
mud->crypto.old_key, mud->crypto.old_key,
mud->crypto.recv.key, mud->crypto.recv.key,
@@ -873,7 +873,7 @@ void mud_keyx_path (struct mud *mud, struct path *path, uint64_t now)
} }
static static
void mud_recv_keyx (struct mud *mud, struct path *path, uint64_t now, uint8_t *data, size_t size) void mud_recv_keyx (struct mud *mud, struct path *path, uint64_t now, unsigned char *data, size_t size)
{ {
if ((memcmp(mud->crypto.send.public, &data[crypto_scalarmult_BYTES], crypto_scalarmult_BYTES)) || if ((memcmp(mud->crypto.send.public, &data[crypto_scalarmult_BYTES], crypto_scalarmult_BYTES)) ||
(memcmp(mud->crypto.recv.public, data, crypto_scalarmult_BYTES))) { (memcmp(mud->crypto.recv.public, data, crypto_scalarmult_BYTES))) {