From 2a367627f09fc0502272724000f6cd098907eb3e Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 15 Feb 2018 06:17:35 -0500 Subject: [PATCH] Finish removing Simon and Speck (GH #585) --- TestVectors/all.txt | 2 -- cryptest.nmake | 4 ++-- simon-speck.zip | Bin 87867 -> 91436 bytes 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/TestVectors/all.txt b/TestVectors/all.txt index 5bbdda4f..6906b212 100644 --- a/TestVectors/all.txt +++ b/TestVectors/all.txt @@ -29,8 +29,6 @@ Test: TestVectors/aes.txt Test: TestVectors/aria.txt Test: TestVectors/kalyna.txt Test: TestVectors/threefish.txt -Test: TestVectors/simon.txt -Test: TestVectors/speck.txt Test: TestVectors/sm4.txt Test: TestVectors/salsa.txt Test: TestVectors/chacha.txt diff --git a/cryptest.nmake b/cryptest.nmake index f329d3fd..7f1077d7 100644 --- a/cryptest.nmake +++ b/cryptest.nmake @@ -47,9 +47,9 @@ # If you use 'make sources' from Linux makefile, then add 'winpipes.cpp' to the list below. -LIB_SRCS = cryptlib.cpp cpu.cpp integer.cpp 3way.cpp adler32.cpp algebra.cpp algparam.cpp arc4.cpp aria-simd.cpp aria.cpp ariatab.cpp asn.cpp authenc.cpp base32.cpp base64.cpp basecode.cpp bfinit.cpp blake2-simd.cpp blake2.cpp blowfish.cpp blumshub.cpp camellia.cpp cast.cpp casts.cpp cbcmac.cpp ccm.cpp chacha.cpp channels.cpp cmac.cpp crc-simd.cpp crc.cpp default.cpp des.cpp dessp.cpp dh.cpp dh2.cpp dll.cpp dsa.cpp eax.cpp ec2n.cpp eccrypto.cpp ecp.cpp elgamal.cpp emsa2.cpp eprecomp.cpp esign.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gcm-simd.cpp gcm.cpp gf256.cpp gf2_32.cpp gf2n.cpp gfpcrypt.cpp gost.cpp gzip.cpp hex.cpp hmac.cpp hrtimer.cpp ida.cpp idea.cpp iterhash.cpp kalyna.cpp kalynatab.cpp keccak.cpp luc.cpp mars.cpp marss.cpp md2.cpp md4.cpp md5.cpp misc.cpp modes.cpp mqueue.cpp mqv.cpp nbtheory.cpp neon-simd.cpp network.cpp oaep.cpp osrng.cpp padlkrng.cpp panama.cpp pkcspad.cpp poly1305.cpp polynomi.cpp pssr.cpp pubkey.cpp queue.cpp rabin.cpp randpool.cpp rc2.cpp rc5.cpp rc6.cpp rdrand.cpp rdtables.cpp rijndael-simd.cpp rijndael.cpp ripemd.cpp rng.cpp rsa.cpp rw.cpp safer.cpp salsa.cpp seal.cpp seed.cpp serpent.cpp sha-simd.cpp sha.cpp sha3.cpp shacal2-simd.cpp shacal2.cpp shark.cpp sharkbox.cpp simon.cpp simon-simd.cpp skipjack.cpp sm3.cpp sm4.cpp socketft.cpp sosemanuk.cpp speck.cpp speck-simd.cpp square.cpp squaretb.cpp sse-simd.cpp strciphr.cpp tea.cpp tftables.cpp threefish.cpp tiger.cpp tigertab.cpp trdlocal.cpp ttmac.cpp tweetnacl.cpp twofish.cpp vmac.cpp wait.cpp wake.cpp whrlpool.cpp winpipes.cpp xtr.cpp xtrcrypt.cpp zdeflate.cpp zinflate.cpp zlib.cpp +LIB_SRCS = cryptlib.cpp cpu.cpp integer.cpp 3way.cpp adler32.cpp algebra.cpp algparam.cpp arc4.cpp aria-simd.cpp aria.cpp ariatab.cpp asn.cpp authenc.cpp base32.cpp base64.cpp basecode.cpp bfinit.cpp blake2-simd.cpp blake2.cpp blowfish.cpp blumshub.cpp camellia.cpp cast.cpp casts.cpp cbcmac.cpp ccm.cpp chacha.cpp channels.cpp cmac.cpp crc-simd.cpp crc.cpp default.cpp des.cpp dessp.cpp dh.cpp dh2.cpp dll.cpp dsa.cpp eax.cpp ec2n.cpp eccrypto.cpp ecp.cpp elgamal.cpp emsa2.cpp eprecomp.cpp esign.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gcm-simd.cpp gcm.cpp gf256.cpp gf2_32.cpp gf2n.cpp gfpcrypt.cpp gost.cpp gzip.cpp hex.cpp hmac.cpp hrtimer.cpp ida.cpp idea.cpp iterhash.cpp kalyna.cpp kalynatab.cpp keccak.cpp luc.cpp mars.cpp marss.cpp md2.cpp md4.cpp md5.cpp misc.cpp modes.cpp mqueue.cpp mqv.cpp nbtheory.cpp neon-simd.cpp network.cpp oaep.cpp osrng.cpp padlkrng.cpp panama.cpp pkcspad.cpp poly1305.cpp polynomi.cpp pssr.cpp pubkey.cpp queue.cpp rabin.cpp randpool.cpp rc2.cpp rc5.cpp rc6.cpp rdrand.cpp rdtables.cpp rijndael-simd.cpp rijndael.cpp ripemd.cpp rng.cpp rsa.cpp rw.cpp safer.cpp salsa.cpp seal.cpp seed.cpp serpent.cpp sha-simd.cpp sha.cpp sha3.cpp shacal2-simd.cpp shacal2.cpp shark.cpp sharkbox.cpp skipjack.cpp sm3.cpp sm4.cpp socketft.cpp sosemanuk.cpp square.cpp squaretb.cpp sse-simd.cpp strciphr.cpp tea.cpp tftables.cpp threefish.cpp tiger.cpp tigertab.cpp trdlocal.cpp ttmac.cpp tweetnacl.cpp twofish.cpp vmac.cpp wait.cpp wake.cpp whrlpool.cpp winpipes.cpp xtr.cpp xtrcrypt.cpp zdeflate.cpp zinflate.cpp zlib.cpp -LIB_OBJS = cryptlib.obj cpu.obj integer.obj 3way.obj adler32.obj algebra.obj algparam.obj arc4.obj aria-simd.obj aria.obj ariatab.obj asn.obj authenc.obj base32.obj base64.obj basecode.obj bfinit.obj blake2-simd.obj blake2.obj blowfish.obj blumshub.obj camellia.obj cast.obj casts.obj cbcmac.obj ccm.obj chacha.obj channels.obj cmac.obj crc-simd.obj crc.obj default.obj des.obj dessp.obj dh.obj dh2.obj dll.obj dsa.obj eax.obj ec2n.obj eccrypto.obj ecp.obj elgamal.obj emsa2.obj eprecomp.obj esign.obj files.obj filters.obj fips140.obj fipstest.obj gcm-simd.obj gcm.obj gf256.obj gf2_32.obj gf2n.obj gfpcrypt.obj gost.obj gzip.obj hex.obj hmac.obj hrtimer.obj ida.obj idea.obj iterhash.obj kalyna.obj kalynatab.obj keccak.obj luc.obj mars.obj marss.obj md2.obj md4.obj md5.obj misc.obj modes.obj mqueue.obj mqv.obj nbtheory.obj neon-simd.obj network.obj oaep.obj osrng.obj padlkrng.obj panama.obj pkcspad.obj poly1305.obj polynomi.obj pssr.obj pubkey.obj queue.obj rabin.obj randpool.obj rc2.obj rc5.obj rc6.obj rdrand.obj rdtables.obj rijndael-simd.obj rijndael.obj ripemd.obj rng.obj rsa.obj rw.obj safer.obj salsa.obj seal.obj seed.obj serpent.obj sha-simd.obj sha.obj sha3.obj shacal2-simd.obj shacal2.obj shark.obj sharkbox.obj simon.obj simon-simd.obj skipjack.obj sm3.obj sm4.obj socketft.obj sosemanuk.obj speck.obj speck-simd.obj square.obj squaretb.obj sse-simd.obj strciphr.obj tea.obj tftables.obj threefish.obj tiger.obj tigertab.obj trdlocal.obj ttmac.obj tweetnacl.obj twofish.obj vmac.obj wait.obj wake.obj whrlpool.obj winpipes.obj xtr.obj xtrcrypt.obj zdeflate.obj zinflate.obj zlib.obj +LIB_OBJS = cryptlib.obj cpu.obj integer.obj 3way.obj adler32.obj algebra.obj algparam.obj arc4.obj aria-simd.obj aria.obj ariatab.obj asn.obj authenc.obj base32.obj base64.obj basecode.obj bfinit.obj blake2-simd.obj blake2.obj blowfish.obj blumshub.obj camellia.obj cast.obj casts.obj cbcmac.obj ccm.obj chacha.obj channels.obj cmac.obj crc-simd.obj crc.obj default.obj des.obj dessp.obj dh.obj dh2.obj dll.obj dsa.obj eax.obj ec2n.obj eccrypto.obj ecp.obj elgamal.obj emsa2.obj eprecomp.obj esign.obj files.obj filters.obj fips140.obj fipstest.obj gcm-simd.obj gcm.obj gf256.obj gf2_32.obj gf2n.obj gfpcrypt.obj gost.obj gzip.obj hex.obj hmac.obj hrtimer.obj ida.obj idea.obj iterhash.obj kalyna.obj kalynatab.obj keccak.obj luc.obj mars.obj marss.obj md2.obj md4.obj md5.obj misc.obj modes.obj mqueue.obj mqv.obj nbtheory.obj neon-simd.obj network.obj oaep.obj osrng.obj padlkrng.obj panama.obj pkcspad.obj poly1305.obj polynomi.obj pssr.obj pubkey.obj queue.obj rabin.obj randpool.obj rc2.obj rc5.obj rc6.obj rdrand.obj rdtables.obj rijndael-simd.obj rijndael.obj ripemd.obj rng.obj rsa.obj rw.obj safer.obj salsa.obj seal.obj seed.obj serpent.obj sha-simd.obj sha.obj sha3.obj shacal2-simd.obj shacal2.obj shark.obj sharkbox.obj skipjack.obj sm3.obj sm4.obj socketft.obj sosemanuk.obj square.obj squaretb.obj sse-simd.obj strciphr.obj tea.obj tftables.obj threefish.obj tiger.obj tigertab.obj trdlocal.obj ttmac.obj tweetnacl.obj twofish.obj vmac.obj wait.obj wake.obj whrlpool.obj winpipes.obj xtr.obj xtrcrypt.obj zdeflate.obj zinflate.obj zlib.obj TEST_SRCS = bench1.cpp bench2.cpp test.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp diff --git a/simon-speck.zip b/simon-speck.zip index 46c07fba240e04e133ddaf92f6ec271e0df97ee2..78e3d08ebd298510535ee4354b2c85fef3c225f8 100644 GIT binary patch delta 3628 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