X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=skein%2Fubi1024.c;h=aa3159b9fc6b8087f5f75c817abaa411f56c572f;hp=6e9cc4cc3ef1a71d18eeb804d75a115c33790c05;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;ds=sidebyside

diff --git a/skein/ubi1024.c b/skein/ubi1024.c
index 6e9cc4c..aa3159b 100644
--- a/skein/ubi1024.c
+++ b/skein/ubi1024.c
@@ -1,7 +1,7 @@
 /* ubi1024.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the ARM-Crypto-Lib.
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 */
 /*
  * \author  Daniel Otte
- * \email   daniel.otte@rub.de
+ * \email   bg@nerilex.org
  * \date    2009-03-12
  * \license GPLv3 or later
  * 
@@ -27,38 +27,38 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
-void ubi1024_init(ubi1024_ctx_t* ctx, const void* g, uint8_t type){
-	memset(ctx->tweak, 0, 15);
-	ctx->tweak[15] = 0x40+type;
+void ubi1024_init(ubi1024_ctx_t *ctx, const void *g, uint8_t type){
+	memset(ctx->tweak.v8, 0, 15);
+	ctx->tweak.v8[15] = 0x40+type;
 	memcpy(ctx->g, g, UBI1024_BLOCKSIZE_B);
 }
 
-void ubi1024_nextBlock(ubi1024_ctx_t* ctx, const void* block){
+void ubi1024_nextBlock(ubi1024_ctx_t *ctx, const void *block){
 	threefish1024_ctx_t tfctx;
-	((uint64_t*)(ctx->tweak))[0] += UBI1024_BLOCKSIZE_B;
-	threefish1024_init(ctx->g, ctx->tweak, &tfctx);
+	ctx->tweak.v64[0] += UBI1024_BLOCKSIZE_B;
+	threefish1024_init(ctx->g, ctx->tweak.v8, &tfctx);
 	memcpy(ctx->g, block, UBI1024_BLOCKSIZE_B);
 	threefish1024_enc(ctx->g, &tfctx);
 	memxor(ctx->g, block, UBI1024_BLOCKSIZE_B);
-	ctx->tweak[15] &= (uint8_t)~0x40;
+	ctx->tweak.v8[15] &= (uint8_t)~0x40;
 } 
 
 
-void ubi1024_lastBlock(ubi1024_ctx_t* ctx, const void* block, uint16_t length_b){
+void ubi1024_lastBlock(ubi1024_ctx_t *ctx, const void *block, uint16_t length_b){
 	threefish1024_ctx_t tfctx;
 	while(length_b>UBI1024_BLOCKSIZE){
 		ubi1024_nextBlock(ctx, block);
 		block = (uint8_t*)block + UBI1024_BLOCKSIZE_B;
 		length_b -= UBI1024_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;
-	threefish1024_init(ctx->g, ctx->tweak, &tfctx);
+		ctx->tweak.v8[14] |= 0x80;
+	threefish1024_init(ctx->g, ctx->tweak.v8, &tfctx);
 	memset(ctx->g, 0, UBI1024_BLOCKSIZE_B);
 	memcpy(ctx->g, block, (length_b+7)/8);
 	if(length_b & 0x07)
@@ -70,7 +70,7 @@ void ubi1024_lastBlock(ubi1024_ctx_t* ctx, const void* block, uint16_t length_b)
 	}
 } 
 
-void ubi1024_ctx2hash(void* dest, const ubi1024_ctx_t* ctx){
+void ubi1024_ctx2hash(void *dest, const ubi1024_ctx_t *ctx){
 	memcpy(dest, ctx->g, UBI1024_BLOCKSIZE_B);
 }