Optimisation for w=8,16,32

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 2 insertions, 2 deletions

diff --git a/extra/libkeccak_state_marshal.c b/extra/libkeccak_state_marshal.c
index 7541164..f4fd4b5 100644
--- a/extra/libkeccak_state_marshal.c
+++ b/extra/libkeccak_state_marshal.c
@@ -28,7 +28,7 @@ libkeccak_state_marshal(const struct libkeccak_state *restrict state, void *rest
 
 	if (!data) {
 		return 7 * sizeof(long int) +
-		       1 * sizeof(int64_t) +
+		       1 * sizeof(uint64_t) +
 		       sizeof(state->S) +
 		       2 * sizeof(size_t) +
 		       state->mptr;
@@ -42,7 +42,7 @@ libkeccak_state_marshal(const struct libkeccak_state *restrict state, void *rest
 	set(wmod);
 	set(l);
 	set(nr);
-	__builtin_memcpy(data, state->S, sizeof(state->S));
+	__builtin_memcpy(data, &state->S, sizeof(state->S));
 	data += sizeof(state->S);
 	set(mptr);
 	set(mlen);