[keccak-asm] final changes
This commit is contained in:
parent
5a83cf2b01
commit
690a1cfe4c
|
@ -429,8 +429,6 @@ keccak_f1600:
|
||||||
subi XL, lo8(4 * 5 * 8 + 8)
|
subi XL, lo8(4 * 5 * 8 + 8)
|
||||||
sbci XH, hi8(4 * 5 * 8 + 8)
|
sbci XH, hi8(4 * 5 * 8 + 8)
|
||||||
rcall theta_2b
|
rcall theta_2b
|
||||||
|
|
||||||
; ret
|
|
||||||
/*
|
/*
|
||||||
-- rho & pi --
|
-- rho & pi --
|
||||||
for(i = 0; i < 5; ++i){
|
for(i = 0; i < 5; ++i){
|
||||||
|
@ -686,7 +684,6 @@ keccak_ctx2hash:
|
||||||
; length_b = (r9:r8) ; r = (r3:r2) ; (H:L)
|
; length_b = (r9:r8) ; r = (r3:r2) ; (H:L)
|
||||||
cp r2, r8
|
cp r2, r8
|
||||||
cpc r3, r9
|
cpc r3, r9
|
||||||
; rjmp 40f
|
|
||||||
brsh 40f
|
brsh 40f
|
||||||
movw XL, r4
|
movw XL, r4
|
||||||
movw ZL, r6
|
movw ZL, r6
|
||||||
|
|
|
@ -1,35 +0,0 @@
|
||||||
/* keecak.c */
|
|
||||||
/*
|
|
||||||
This file is part of the AVR-Crypto-Lib.
|
|
||||||
Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
|
|
||||||
|
|
||||||
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
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include "memxor.h"
|
|
||||||
#include "keccak.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
//void keccak_f1600(uint8_t a[200]);
|
|
||||||
void keccak_lastBlock_f1(keccak_ctx_t* ctx, const void* block, uint16_t length_b);
|
|
||||||
void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
|
|
||||||
keccak_lastBlock_f1(ctx, block, length_b);
|
|
||||||
// ctx->a[ctx->bs - 1] ^= 0x80;
|
|
||||||
// keccak_f1600(ctx->a);
|
|
||||||
}
|
|
||||||
|
|
||||||
*/
|
|
|
@ -6,7 +6,7 @@ HASHES += $(ALGO_NAME)
|
||||||
|
|
||||||
$(ALGO_NAME)_DIR := keccak/
|
$(ALGO_NAME)_DIR := keccak/
|
||||||
$(ALGO_NAME)_INCDIR := memxor/ hfal/
|
$(ALGO_NAME)_INCDIR := memxor/ hfal/
|
||||||
$(ALGO_NAME)_OBJ := keccak-stub.o keccak-asm.o memxor.o
|
$(ALGO_NAME)_OBJ := keccak-asm.o
|
||||||
$(ALGO_NAME)_TESTBIN := main-keccak-test.o hfal_keccak.o $(CLI_STD) $(HFAL_STD)
|
$(ALGO_NAME)_TESTBIN := main-keccak-test.o hfal_keccak.o $(CLI_STD) $(HFAL_STD)
|
||||||
$(ALGO_NAME)_NESSIE_TEST := test nessie
|
$(ALGO_NAME)_NESSIE_TEST := test nessie
|
||||||
$(ALGO_NAME)_PERFORMANCE_TEST := performance
|
$(ALGO_NAME)_PERFORMANCE_TEST := performance
|
||||||
|
|
Loading…
Reference in New Issue