removing Picnic,NTRUprime,Rainbow,Saber (#129)

open-quantum-safe · Nov 25, 2022 · 00ef286 · 00ef286
1 parent 932edb9
commit 00ef286
Show file tree

Hide file tree

Showing 28 changed files with 19 additions and 1,967 deletions.
diff --git a/README.md b/README.md
@@ -70,8 +70,6 @@ The following quantum-safe algorithms from liboqs are supported (assuming they h
 - **HQC**: `hqc-128-sha256`, `hqc-192-sha384`, `hqc-256-sha512`†
 - **Kyber**: `kyber-512-sha256`, `kyber-768-sha384`, `kyber-1024-sha512`, `kyber-512-90s-sha256`, `kyber-768-90s-sha384`, `kyber-1024-90s-sha512`
 - **NTRU**: `ntru-hps2048509-sha512`, `ntru-hps2048677-sha512`, `ntru-hps4096821-sha512`, `ntru-hps40961229-sha512`, `ntru-hrss701-sha512`, `ntru-hrss1373-sha512`
-- **NTRU-PRIME**: `ntruprime-ntrulpr653-sha256`, `ntruprime-sntrup653-sha256`, `ntruprime-ntrulpr761-sha384`, `ntruprime-sntrup761-sha384`, `ntruprime-ntrulpr857-sha384`, `ntruprime-sntrup857-sha384`, `ntruprime-ntrulpr1277-sha512`, `ntruprime-sntrup1277-sha512`
-- **Saber**: `saber-lightsaber-sha256`, `saber-saber-sha384`, `saber-firesaber-sha512`
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_KEXS_END -->
 
 For each `<KEX>` listed above, the following hybrid algorithms are made available as follows:
@@ -89,8 +87,6 @@ The following digital signature algorithms from liboqs are supported (assuming t
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_START -->
 - **Dilithium**: `dilithium2`, `dilithium3`\*, `dilithium5`, `dilithium2aes`\*, `dilithium3aes`, `dilithium5aes`\*
 - **Falcon**: `falcon512`\*, `falcon1024`\*
-- **Picnic**: `picnicL1FS`, `picnicL1UR`, `picnicL1full`\*, `picnicL3FS`\*, `picnicL3UR`, `picnicL3full`, `picnicL5FS`, `picnicL5UR`, `picnicL5full`
-- **Rainbow**: `rainbowIIIclassic`, `rainbowIIIcircumzenithal`, `rainbowIIIcompressed`, `rainbowVclassic`, `rainbowVcircumzenithal`, `rainbowVcompressed`
 - **SPHINCS**: `sphincsharaka128frobust`, `sphincsharaka128fsimple`\*, `sphincsharaka128srobust`, `sphincsharaka128ssimple`, `sphincssha256128frobust`, `sphincssha256128srobust`, `sphincssha256128fsimple`, `sphincssha256128ssimple`, `sphincsshake256128frobust`, `sphincsshake256128srobust`, `sphincsshake256128fsimple`, `sphincsshake256128ssimple`, `sphincsharaka192frobust`\*, `sphincsharaka192srobust`, `sphincsharaka192fsimple`, `sphincsharaka192ssimple`, `sphincssha256192frobust`, `sphincssha256192srobust`, `sphincssha256192fsimple`, `sphincssha256192ssimple`, `sphincsshake256192frobust`, `sphincsshake256192srobust`, `sphincsshake256192fsimple`, `sphincsshake256192ssimple`, `sphincsharaka256frobust`, `sphincsharaka256srobust`, `sphincsharaka256fsimple`, `sphincsharaka256ssimple`, `sphincssha256256frobust`, `sphincssha256256srobust`, `sphincssha256256fsimple`, `sphincssha256256ssimple`, `sphincsshake256256frobust`, `sphincsshake256256srobust`, `sphincsshake256256fsimple`, `sphincsshake256256ssimple`
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_END -->
 

diff --git a/kex.c b/kex.c
@@ -124,9 +124,6 @@ static const struct kexalg kexalgs[] = {
 	{ KEX_FRODOKEM_640_SHAKE_SHA256, KEX_KEM_FRODOKEM_640_SHAKE_SHA256, 0, SSH_DIGEST_SHA256 },
 	{ KEX_FRODOKEM_976_SHAKE_SHA384, KEX_KEM_FRODOKEM_976_SHAKE_SHA384, 0, SSH_DIGEST_SHA384 },
 	{ KEX_FRODOKEM_1344_SHAKE_SHA512, KEX_KEM_FRODOKEM_1344_SHAKE_SHA512, 0, SSH_DIGEST_SHA512 },
-	{ KEX_SABER_LIGHTSABER_SHA256, KEX_KEM_SABER_LIGHTSABER_SHA256, 0, SSH_DIGEST_SHA256 },
-	{ KEX_SABER_SABER_SHA384, KEX_KEM_SABER_SABER_SHA384, 0, SSH_DIGEST_SHA384 },
-	{ KEX_SABER_FIRESABER_SHA512, KEX_KEM_SABER_FIRESABER_SHA512, 0, SSH_DIGEST_SHA512 },
 	{ KEX_KYBER_512_SHA256, KEX_KEM_KYBER_512_SHA256, 0, SSH_DIGEST_SHA256 },
 	{ KEX_KYBER_768_SHA384, KEX_KEM_KYBER_768_SHA384, 0, SSH_DIGEST_SHA384 },
 	{ KEX_KYBER_1024_SHA512, KEX_KEM_KYBER_1024_SHA512, 0, SSH_DIGEST_SHA512 },
@@ -154,24 +151,13 @@ static const struct kexalg kexalgs[] = {
 	{ KEX_HQC_128_SHA256, KEX_KEM_HQC_128_SHA256, 0, SSH_DIGEST_SHA256 },
 	{ KEX_HQC_192_SHA384, KEX_KEM_HQC_192_SHA384, 0, SSH_DIGEST_SHA384 },
 	{ KEX_HQC_256_SHA512, KEX_KEM_HQC_256_SHA512, 0, SSH_DIGEST_SHA512 },
-	{ KEX_NTRUPRIME_NTRULPR653_SHA256, KEX_KEM_NTRUPRIME_NTRULPR653_SHA256, 0, SSH_DIGEST_SHA256 },
-	{ KEX_NTRUPRIME_SNTRUP653_SHA256, KEX_KEM_NTRUPRIME_SNTRUP653_SHA256, 0, SSH_DIGEST_SHA256 },
-	{ KEX_NTRUPRIME_NTRULPR761_SHA384, KEX_KEM_NTRUPRIME_NTRULPR761_SHA384, 0, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_SNTRUP761_SHA384, KEX_KEM_NTRUPRIME_SNTRUP761_SHA384, 0, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_NTRULPR857_SHA384, KEX_KEM_NTRUPRIME_NTRULPR857_SHA384, 0, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_SNTRUP857_SHA384, KEX_KEM_NTRUPRIME_SNTRUP857_SHA384, 0, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_NTRULPR1277_SHA512, KEX_KEM_NTRUPRIME_NTRULPR1277_SHA512, 0, SSH_DIGEST_SHA512 },
-	{ KEX_NTRUPRIME_SNTRUP1277_SHA512, KEX_KEM_NTRUPRIME_SNTRUP1277_SHA512, 0, SSH_DIGEST_SHA512 },
 #ifdef OPENSSL_HAS_ECC
 	{ KEX_FRODOKEM_640_AES_ECDH_NISTP256_SHA256, KEX_KEM_FRODOKEM_640_AES_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
 	{ KEX_FRODOKEM_976_AES_ECDH_NISTP384_SHA384, KEX_KEM_FRODOKEM_976_AES_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
 	{ KEX_FRODOKEM_1344_AES_ECDH_NISTP521_SHA512, KEX_KEM_FRODOKEM_1344_AES_ECDH_NISTP521_SHA512, NID_secp521r1, SSH_DIGEST_SHA512 },
 	{ KEX_FRODOKEM_640_SHAKE_ECDH_NISTP256_SHA256, KEX_KEM_FRODOKEM_640_SHAKE_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
 	{ KEX_FRODOKEM_976_SHAKE_ECDH_NISTP384_SHA384, KEX_KEM_FRODOKEM_976_SHAKE_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
 	{ KEX_FRODOKEM_1344_SHAKE_ECDH_NISTP521_SHA512, KEX_KEM_FRODOKEM_1344_SHAKE_ECDH_NISTP521_SHA512, NID_secp521r1, SSH_DIGEST_SHA512 },
-	{ KEX_SABER_LIGHTSABER_ECDH_NISTP256_SHA256, KEX_KEM_SABER_LIGHTSABER_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
-	{ KEX_SABER_SABER_ECDH_NISTP384_SHA384, KEX_KEM_SABER_SABER_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
-	{ KEX_SABER_FIRESABER_ECDH_NISTP521_SHA512, KEX_KEM_SABER_FIRESABER_ECDH_NISTP521_SHA512, NID_secp521r1, SSH_DIGEST_SHA512 },
 	{ KEX_KYBER_512_ECDH_NISTP256_SHA256, KEX_KEM_KYBER_512_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
 	{ KEX_KYBER_768_ECDH_NISTP384_SHA384, KEX_KEM_KYBER_768_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
 	{ KEX_KYBER_1024_ECDH_NISTP521_SHA512, KEX_KEM_KYBER_1024_ECDH_NISTP521_SHA512, NID_secp521r1, SSH_DIGEST_SHA512 },
@@ -199,14 +185,6 @@ static const struct kexalg kexalgs[] = {
 	{ KEX_HQC_128_ECDH_NISTP256_SHA256, KEX_KEM_HQC_128_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
 	{ KEX_HQC_192_ECDH_NISTP384_SHA384, KEX_KEM_HQC_192_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
 	{ KEX_HQC_256_ECDH_NISTP521_SHA512, KEX_KEM_HQC_256_ECDH_NISTP521_SHA512, NID_secp521r1, SSH_DIGEST_SHA512 },
-	{ KEX_NTRUPRIME_NTRULPR653_ECDH_NISTP256_SHA256, KEX_KEM_NTRUPRIME_NTRULPR653_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
-	{ KEX_NTRUPRIME_SNTRUP653_ECDH_NISTP256_SHA256, KEX_KEM_NTRUPRIME_SNTRUP653_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
-	{ KEX_NTRUPRIME_NTRULPR761_ECDH_NISTP384_SHA384, KEX_KEM_NTRUPRIME_NTRULPR761_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_SNTRUP761_ECDH_NISTP384_SHA384, KEX_KEM_NTRUPRIME_SNTRUP761_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_NTRULPR857_ECDH_NISTP384_SHA384, KEX_KEM_NTRUPRIME_NTRULPR857_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_SNTRUP857_ECDH_NISTP384_SHA384, KEX_KEM_NTRUPRIME_SNTRUP857_ECDH_NISTP384_SHA384, NID_secp384r1, SSH_DIGEST_SHA384 },
-	{ KEX_NTRUPRIME_NTRULPR1277_ECDH_NISTP521_SHA512, KEX_KEM_NTRUPRIME_NTRULPR1277_ECDH_NISTP521_SHA512, NID_secp521r1, SSH_DIGEST_SHA512 },
-	{ KEX_NTRUPRIME_SNTRUP1277_ECDH_NISTP521_SHA512, KEX_KEM_NTRUPRIME_SNTRUP1277_ECDH_NISTP521_SHA512, NID_secp521r1, SSH_DIGEST_SHA512 },
 #endif /* OPENSSL_HAS_ECC */
 ///// OQS_TEMPLATE_FRAGMENT_ADD_KEX_ALGS_END