X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=skein%2Fubi512.c;h=526018fc9e4c96b6e097a4c8dabc484c1874f8a1;hb=7390f9235d6bc08b7fe34a5f43a04bd3b58f6ea6;hp=b411690aaa624ae064637d4aa629e68488e3040d;hpb=d70d1d77bab1a5f5278227d674bc59da0378fe15;p=arm-crypto-lib.git

diff --git a/skein/ubi512.c b/skein/ubi512.c
index b411690..526018f 100644
--- a/skein/ubi512.c
+++ b/skein/ubi512.c
@@ -27,23 +27,23 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
 void ubi512_init(ubi512_ctx_t* ctx, const void* g, uint8_t type){
-	memset(ctx->tweak, 0, 15);
-	ctx->tweak[15] = 0x40+type;
+	memset(ctx->tweak.v8, 0, 15);
+	ctx->tweak.v8[15] = 0x40+type;
 	memcpy(ctx->g, g, UBI512_BLOCKSIZE_B);
 }
 
 void ubi512_nextBlock(ubi512_ctx_t* ctx, const void* block){
 	threefish512_ctx_t tfctx;
-	((uint64_t*)(ctx->tweak))[0] += UBI512_BLOCKSIZE_B;
-	threefish512_init(ctx->g, ctx->tweak, &tfctx);
+	ctx->tweak.v64[0] += UBI512_BLOCKSIZE_B;
+	threefish512_init(ctx->g, ctx->tweak.v8, &tfctx);
 	memcpy(ctx->g, block, UBI512_BLOCKSIZE_B);
 	threefish512_enc(ctx->g, &tfctx);
 	memxor(ctx->g, block, UBI512_BLOCKSIZE_B);
-	ctx->tweak[15] &= (uint8_t)~0x40;
+	ctx->tweak.v8[15] &= (uint8_t)~0x40;
 } 
 
 
@@ -54,11 +54,11 @@ void ubi512_lastBlock(ubi512_ctx_t* ctx, const void* block, uint16_t length_b){
 		block = (uint8_t*)block + UBI512_BLOCKSIZE_B;
 		length_b -= UBI512_BLOCKSIZE;
 	}
-	ctx->tweak[15] |= 0x80;
-	((uint64_t*)(ctx->tweak))[0] += (length_b+7)/8;
+	ctx->tweak.v8[15] |= 0x80;
+	ctx->tweak.v64[0] += (length_b+7)/8;
 	if(length_b & 0x07)
-		ctx->tweak[14] |= 0x80;
-	threefish512_init(ctx->g, ctx->tweak, &tfctx);
+		ctx->tweak.v8[14] |= 0x80;
+	threefish512_init(ctx->g, ctx->tweak.v8, &tfctx);
 	memset(ctx->g, 0, UBI512_BLOCKSIZE_B);
 	memcpy(ctx->g, block, (length_b+7)/8);
 	if(length_b & 0x07)