Deleted unneeded casts of memxor arguments.

diff --git a/ChangeLog b/ChangeLog
index 15ae263398a01da2e37278cc552e88e3eb5bbddf..f1ae79c711cc7529923fba5203fa78a52d5d7be8 100644 (file)
--- 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 b061b4b84e0b7fe3fcb7230d21f8e0c21c8f5b55..82abceaabcbe8ee813f8e0512380f5f476ba02a2 100644 (file)
--- 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 0c82217b3824a513236fd53e901ddee4f7280fc7..a845f1d3296fd8eec97399fa5244634160f2ffa6 100644 (file)
--- 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 21e7beb72e3886743cb1216a5f220e14ef1fc23f..c8381159fba9788d621ca055d9db2532c264f0bd 100644 (file)
--- 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);