#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;
+ 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){
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;
}
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)