fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / skein / ubi256.c

diff --git a/skein/ubi256.c b/skein/ubi256.c
index 31523da2c06acbe854a64ae8cd4bdc6af25f2ecc..01229ac5b30658df7b153a6cf6f555c107b39f1a 100644 (file)
--- a/skein/ubi256.c
+++ b/skein/ubi256.c
@@ -1,7 +1,7 @@
 /* ubi256.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,39 +27,39 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
-void ubi256_init(ubi256_ctx_t* ctx, const void* g, uint8_t type){
-       memset(ctx->tweak, 0, 15);
-       ctx->tweak[15] = 0x40+type;
+void ubi256_init(ubi256_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, 32);
 }
 
-void ubi256_nextBlock(ubi256_ctx_t* ctx, const void* block){
+void ubi256_nextBlock(ubi256_ctx_t *ctx, const void *block){
        threefish256_ctx_t tfctx;
-       ((uint64_t*)(ctx->tweak))[0] += UBI256_BLOCKSIZE_B;
-       threefish256_init(ctx->g, ctx->tweak, &tfctx);
+       ctx->tweak.v64[0] += UBI256_BLOCKSIZE_B;
+       threefish256_init(ctx->g, ctx->tweak.v8, &tfctx);
        memcpy(ctx->g, block, UBI256_BLOCKSIZE_B);
        threefish256_enc(ctx->g, &tfctx);
        memxor(ctx->g, block, UBI256_BLOCKSIZE_B);
-       ctx->tweak[15] &= (uint8_t)~0x40;
+       ctx->tweak.v8[15] &= (uint8_t)~0x40;
 } 
 
 
-void ubi256_lastBlock(ubi256_ctx_t* ctx, const void* block, uint16_t length_b){
+void ubi256_lastBlock(ubi256_ctx_t *ctx, const void *block, uint16_t length_b){
        threefish256_ctx_t tfctx;
        while(length_b>UBI256_BLOCKSIZE){
                ubi256_nextBlock(ctx, block);
                block = (uint8_t*)block + UBI256_BLOCKSIZE_B;
                length_b -= UBI256_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;
+               ctx->tweak.v8[14] |= 0x80;
        }
-       threefish256_init(ctx->g, ctx->tweak, &tfctx);
+       threefish256_init(ctx->g, ctx->tweak.v8, &tfctx);
        memset(ctx->g, 0, UBI256_BLOCKSIZE_B);
        memcpy(ctx->g, block, (length_b+7)/8);
        if(length_b & 0x07){
@@ -74,7 +74,7 @@ void ubi256_lastBlock(ubi256_ctx_t* ctx, const void* block, uint16_t length_b){
 
 } 
 
-void ubi256_ctx2hash(void* dest, const ubi256_ctx_t* ctx){
+void ubi256_ctx2hash(void *dest, const ubi256_ctx_t *ctx){
        memcpy(dest, ctx->g, UBI256_BLOCKSIZE_B);
 }