From 1b5897ef03e6ac0efac8ff90b21f6e7690a89da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 24 Apr 2013 23:14:21 +0200
Subject: [PATCH] Deleted unneeded casts of memxor arguments.
---
ChangeLog | 5 +++++
salsa20-crypt.c | 4 ++--
salsa20r12-crypt.c | 4 ++--
sha3.c | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 15ae2633..f1ae79c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-04-24 Niels Möller <nisse@lysator.liu.se>
+ * salsa20-crypt.c (salsa20_crypt): Deleted cast of memxor
+ argument, no longer needed.
+ * salsa20r12-crypt.c (salsa20r12_crypt): Likewise.
+ * sha3.c (sha3_absorb): Likewise.
+
* memxor.h: Updated prototypes. Drop include of nettle-types.h.
* memxor.c: Include nettle-types.h, for uintptr_t. Replace all
diff --git a/salsa20-crypt.c b/salsa20-crypt.c
index b061b4b8..82abceaa 100644
--- a/salsa20-crypt.c
+++ b/salsa20-crypt.c
@@ -61,10 +61,10 @@ salsa20_crypt(struct salsa20_ctx *ctx,
if (length <= SALSA20_BLOCK_SIZE)
{
- memxor3 (c, m, (uint8_t *) x, length);
+ memxor3 (c, m, x, length);
return;
}
- memxor3 (c, m, (uint8_t *) x, SALSA20_BLOCK_SIZE);
+ memxor3 (c, m, x, SALSA20_BLOCK_SIZE);
length -= SALSA20_BLOCK_SIZE;
c += SALSA20_BLOCK_SIZE;
diff --git a/salsa20r12-crypt.c b/salsa20r12-crypt.c
index 0c82217b..a845f1d3 100644
--- a/salsa20r12-crypt.c
+++ b/salsa20r12-crypt.c
@@ -62,10 +62,10 @@ salsa20r12_crypt(struct salsa20_ctx *ctx,
if (length <= SALSA20_BLOCK_SIZE)
{
- memxor3 (c, m, (uint8_t *) x, length);
+ memxor3 (c, m, x, length);
return;
}
- memxor3 (c, m, (uint8_t *) x, SALSA20_BLOCK_SIZE);
+ memxor3 (c, m, x, SALSA20_BLOCK_SIZE);
length -= SALSA20_BLOCK_SIZE;
c += SALSA20_BLOCK_SIZE;
diff --git a/sha3.c b/sha3.c
index 21e7beb7..c8381159 100644
--- a/sha3.c
+++ b/sha3.c
@@ -46,7 +46,7 @@ sha3_absorb (struct sha3_state *state, unsigned length, const uint8_t *data)
*p ^= LE_READ_UINT64 (data);
}
#else /* !WORDS_BIGENDIAN */
- memxor ((uint8_t *) state->a, data, length);
+ memxor (state->a, data, length);
#endif
sha3_permute (state);
--
GitLab