From 69d6349f8ad9d35c2acdb4e4e38ad42cd28b426c Mon Sep 17 00:00:00 2001 From: bg Date: Fri, 4 Feb 2011 03:48:33 +0000 Subject: [PATCH] Bug in TDES fixed --- des/des.c | 4 ++-- mkfiles/jh_simple_small_c.mk | 4 ++-- testvectors/Rc6-128-128.verified.test-vectors | Bin 357459 -> 357459 bytes .../ExtremelyLongMsgKAT_224.txt | 0 .../ExtremelyLongMsgKAT_256.txt | 0 .../ExtremelyLongMsgKAT_384.txt | 0 .../ExtremelyLongMsgKAT_512.txt | 0 .../IntermediateValues_1BlockMsg_224.txt | 0 .../IntermediateValues_1BlockMsg_256.txt | 0 .../IntermediateValues_1BlockMsg_384.txt | 0 .../IntermediateValues_1BlockMsg_512.txt | 0 .../IntermediateValues_2BlockMsg_224.txt | 0 .../IntermediateValues_2BlockMsg_256.txt | 0 .../IntermediateValues_2BlockMsg_384.txt | 0 .../IntermediateValues_2BlockMsg_512.txt | 0 .../LongMsgKAT_224.txt | 0 .../LongMsgKAT_256.txt | 0 .../LongMsgKAT_384.txt | 0 .../LongMsgKAT_512.txt | 0 .../MonteCarlo_224.txt | 0 .../MonteCarlo_256.txt | 0 .../MonteCarlo_384.txt | 0 .../MonteCarlo_512.txt | 0 .../ShortMsgKAT_224.txt | 0 .../ShortMsgKAT_256.txt | 0 .../ShortMsgKAT_384.txt | 0 .../ShortMsgKAT_512.txt | 0 27 files changed, 4 insertions(+), 4 deletions(-) rename testvectors/shavs/{Groestl => Groestl-round2}/ExtremelyLongMsgKAT_224.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/ExtremelyLongMsgKAT_256.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/ExtremelyLongMsgKAT_384.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/ExtremelyLongMsgKAT_512.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_1BlockMsg_224.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_1BlockMsg_256.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_1BlockMsg_384.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_1BlockMsg_512.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_2BlockMsg_224.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_2BlockMsg_256.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_2BlockMsg_384.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/IntermediateValues_2BlockMsg_512.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/LongMsgKAT_224.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/LongMsgKAT_256.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/LongMsgKAT_384.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/LongMsgKAT_512.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/MonteCarlo_224.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/MonteCarlo_256.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/MonteCarlo_384.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/MonteCarlo_512.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/ShortMsgKAT_224.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/ShortMsgKAT_256.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/ShortMsgKAT_384.txt (100%) rename testvectors/shavs/{Groestl => Groestl-round2}/ShortMsgKAT_512.txt (100%) diff --git a/des/des.c b/des/des.c index 2600a22..0b993c0 100644 --- a/des/des.c +++ b/des/des.c @@ -380,9 +380,9 @@ void tdes_enc(void* out, void* in, const void* key){ /******************************************************************************/ void tdes_dec(void* out, void* in, const uint8_t* key){ - des_dec(out, in, (uint8_t*)key + 0); + des_dec(out, in, (uint8_t*)key +16); des_enc(out, out, (uint8_t*)key + 8); - des_dec(out, out, (uint8_t*)key +16); + des_dec(out, out, (uint8_t*)key + 0); } /******************************************************************************/ diff --git a/mkfiles/jh_simple_small_c.mk b/mkfiles/jh_simple_small_c.mk index a916a7c..51d0c74 100644 --- a/mkfiles/jh_simple_small_c.mk +++ b/mkfiles/jh_simple_small_c.mk @@ -1,7 +1,7 @@ -# Makefile for Grøstl +# Makefile for JH ALGO_NAME := JH_SIMPLE_SMALL_C -# comment out the following line for removement of Grøstl from the build process +# comment out the following line for removement of JH from the build process HASHES += $(ALGO_NAME) $(ALGO_NAME)_DIR := jh/ diff --git a/testvectors/Rc6-128-128.verified.test-vectors b/testvectors/Rc6-128-128.verified.test-vectors index a2f01c6d8c67aef27755c0cb3d5f66eb05d4b008..196698d2b0476862432389fa0e6ece051af29266 100644 GIT binary patch delta 12118 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

oU3h^Efaas0>4gbiJ#+mkCY4uSIFfc<|R&WV*{2 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 diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_224.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_224.txt similarity index 100% rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_224.txt rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_224.txt diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_256.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_256.txt similarity index 100% rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_256.txt rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_256.txt diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_384.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_384.txt similarity index 100% rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_384.txt rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_384.txt diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_512.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_512.txt similarity index 100% rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_512.txt rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_512.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_224.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_224.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_224.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_224.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_256.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_256.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_256.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_256.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_384.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_384.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_384.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_384.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_512.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_512.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_512.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_512.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_224.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_224.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_224.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_224.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_256.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_256.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_256.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_256.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_384.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_384.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_384.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_384.txt diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_512.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_512.txt similarity index 100% rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_512.txt rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_512.txt diff --git a/testvectors/shavs/Groestl/LongMsgKAT_224.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_224.txt similarity index 100% rename from testvectors/shavs/Groestl/LongMsgKAT_224.txt rename to testvectors/shavs/Groestl-round2/LongMsgKAT_224.txt diff --git a/testvectors/shavs/Groestl/LongMsgKAT_256.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_256.txt similarity index 100% rename from testvectors/shavs/Groestl/LongMsgKAT_256.txt rename to testvectors/shavs/Groestl-round2/LongMsgKAT_256.txt diff --git a/testvectors/shavs/Groestl/LongMsgKAT_384.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_384.txt similarity index 100% rename from testvectors/shavs/Groestl/LongMsgKAT_384.txt rename to testvectors/shavs/Groestl-round2/LongMsgKAT_384.txt diff --git a/testvectors/shavs/Groestl/LongMsgKAT_512.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_512.txt similarity index 100% rename from testvectors/shavs/Groestl/LongMsgKAT_512.txt rename to testvectors/shavs/Groestl-round2/LongMsgKAT_512.txt diff --git a/testvectors/shavs/Groestl/MonteCarlo_224.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_224.txt similarity index 100% rename from testvectors/shavs/Groestl/MonteCarlo_224.txt rename to testvectors/shavs/Groestl-round2/MonteCarlo_224.txt diff --git a/testvectors/shavs/Groestl/MonteCarlo_256.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_256.txt similarity index 100% rename from testvectors/shavs/Groestl/MonteCarlo_256.txt rename to testvectors/shavs/Groestl-round2/MonteCarlo_256.txt diff --git a/testvectors/shavs/Groestl/MonteCarlo_384.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_384.txt similarity index 100% rename from testvectors/shavs/Groestl/MonteCarlo_384.txt rename to testvectors/shavs/Groestl-round2/MonteCarlo_384.txt diff --git a/testvectors/shavs/Groestl/MonteCarlo_512.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_512.txt similarity index 100% rename from testvectors/shavs/Groestl/MonteCarlo_512.txt rename to testvectors/shavs/Groestl-round2/MonteCarlo_512.txt diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_224.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_224.txt similarity index 100% rename from testvectors/shavs/Groestl/ShortMsgKAT_224.txt rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_224.txt diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_256.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_256.txt similarity index 100% rename from testvectors/shavs/Groestl/ShortMsgKAT_256.txt rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_256.txt diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_384.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_384.txt similarity index 100% rename from testvectors/shavs/Groestl/ShortMsgKAT_384.txt rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_384.txt diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_512.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_512.txt similarity index 100% rename from testvectors/shavs/Groestl/ShortMsgKAT_512.txt rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_512.txt -- 2.39.5