Skip to content

Commit

Permalink
Remove rainbowI, sike/sidh (#126)
Browse files Browse the repository at this point in the history
  • Loading branch information
baentsch authored Aug 3, 2022
1 parent 1a5c568 commit 63d0b31
Show file tree
Hide file tree
Showing 16 changed files with 13 additions and 1,705 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ The following quantum-safe algorithms from liboqs are supported (assuming they h
- **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`
- **SIDH**: `sidh-p434-sha256`, `sidh-p434-compressed-sha256`, `sidh-p610-sha256`, `sidh-p610-compressed-sha256`, `sidh-p751-sha256`, `sidh-p751-compressed-sha256`
- **SIKE**: `sike-p434-sha256`, `sike-p434-compressed-sha256`, `sike-p610-sha256`, `sike-p610-compressed-sha256`, `sike-p751-sha256`, `sike-p751-compressed-sha256`
- **Saber**: `saber-lightsaber-sha256`, `saber-saber-sha384`, `saber-firesaber-sha512`
<!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_KEXS_END -->

Expand All @@ -92,7 +90,7 @@ The following digital signature algorithms from liboqs are supported (assuming t
- **Dilithium**: `dilithium2`, `dilithium3`\*, `dilithium5`, `dilithium2aes`\*, `dilithium3aes`, `dilithium5aes`\*
- **Falcon**: `falcon512`\*, `falcon1024`\*
- **Picnic**: `picnicL1FS`, `picnicL1UR`, `picnicL1full`\*, `picnicL3FS`\*, `picnicL3UR`, `picnicL3full`, `picnicL5FS`, `picnicL5UR`, `picnicL5full`
- **Rainbow**: `rainbowIclassic`, `rainbowIcircumzenithal`, `rainbowIcompressed`, `rainbowIIIclassic`, `rainbowIIIcircumzenithal`, `rainbowIIIcompressed`, `rainbowVclassic`, `rainbowVcircumzenithal`, `rainbowVcompressed`
- **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 -->

Expand Down
11 changes: 11 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
version: 1.0.{build}

# For RDP access be sure to set the environment variable APPVEYOR_RDP_PASSWORD
# (in AppVeyor project settings)

# TODO: Add MSVC support
image: Visual Studio 2019

Expand All @@ -20,6 +23,10 @@ for:
choco install -y strawberryperl
SET "OPENSSL_ROOT_DIR=C:\OpenSSL-Win64"
# Uncomment to activate RDP debugging:
#init:
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

build_script:
- cmd: '%APPVEYOR_BUILD_FOLDER%\appveyor_build.bat'

Expand All @@ -34,3 +41,7 @@ test_script:
echo "%PATH%"
set PATH=%cd%;c:\cygwin64\bin;%PATH% && echo %PATH% && python oqs-test/try_connection.py doone
# Uncomment to be able to log in and check results / debug via RDP at the end of build
#on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

2 changes: 1 addition & 1 deletion appveyor_build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IF %COMPILER%==cygwin (
@echo on
SET "PATH=C:\cywin64\bin;c:\cygwin64;%PATH%"
c:\cygwin64\bin\bash.exe -lc "setup-x86_64.exe -qnNdO -R C:/cygwin64 -l C:/cygwin/var/cache/setup -P openssl -P libssl-devel -P zlib -P zlib-devel -P ninja -P cmake -P gcc -P make -P autoconf && cd ${APPVEYOR_BUILD_FOLDER} && openssl version && cygcheck -c && pwd && git clone --depth 1 --branch main https://github.com/open-quantum-safe/liboqs.git && cd liboqs && mkdir build && cd build && cmake .. -GNinja -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${APPVEYOR_BUILD_FOLDER}/oqs -DOQS_BUILD_ONLY_LIB=ON && ninja -v && ninja install && cd ${APPVEYOR_BUILD_FOLDER} && mkdir -p -m 0755 /var/empty && export LIBOQS_INSTALL=`pwd`/oqs && autoreconf && LDFLAGS=\"-Wl,--stack,20000000\" ./configure --without-openssl-header-check --with-liboqs-dir=`pwd`/oqs --with-libs=-lm && make && make install && TEST_SSH_UNSAFE_PERMISSIONS=1 make tests LTESTS=\"\" "
c:\cygwin64\bin\bash.exe -lc "export PPD=$OLDPWD && export LIBOQS_INSTALL=$PPD/oqs && env && pwd && setup-x86_64.exe -qnNdO -R C:/cygwin64 -l C:/cygwin/var/cache/setup -P openssl -P libssl-devel -P zlib -P zlib-devel -P ninja -P cmake -P gcc -P make -P autoconf && cd $PPD && openssl version && cygcheck -c && git clone --depth 1 --branch main https://github.com/open-quantum-safe/liboqs.git && cd liboqs && mkdir build && cd build && cmake .. -GNinja -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=$LIBOQS_INSTALL -DOQS_BUILD_ONLY_LIB=ON && ninja -v && ninja install && cd ../.. && mkdir -p -m 0755 /var/empty && autoupdate && autoreconf && LDFLAGS=\"-Wl,--stack,20000000\" ./configure --without-openssl-header-check --with-liboqs-dir=$LIBOQS_INSTALL --with-libs=-lm && make && make install && TEST_SSH_UNSAFE_PERMISSIONS=1 make tests LTESTS=\"\" "
)
24 changes: 0 additions & 24 deletions kex.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +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_SIDH_P434_SHA256, KEX_KEM_SIDH_P434_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P434_COMPRESSED_SHA256, KEX_KEM_SIDH_P434_COMPRESSED_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P610_SHA256, KEX_KEM_SIDH_P610_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P610_COMPRESSED_SHA256, KEX_KEM_SIDH_P610_COMPRESSED_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P751_SHA256, KEX_KEM_SIDH_P751_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P751_COMPRESSED_SHA256, KEX_KEM_SIDH_P751_COMPRESSED_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P434_SHA256, KEX_KEM_SIKE_P434_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P434_COMPRESSED_SHA256, KEX_KEM_SIKE_P434_COMPRESSED_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P610_SHA256, KEX_KEM_SIKE_P610_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P610_COMPRESSED_SHA256, KEX_KEM_SIKE_P610_COMPRESSED_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P751_SHA256, KEX_KEM_SIKE_P751_SHA256, 0, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P751_COMPRESSED_SHA256, KEX_KEM_SIKE_P751_COMPRESSED_SHA256, 0, SSH_DIGEST_SHA256 },
{ 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 },
Expand Down Expand Up @@ -181,18 +169,6 @@ static const struct kexalg kexalgs[] = {
{ 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_SIDH_P434_ECDH_NISTP256_SHA256, KEX_KEM_SIDH_P434_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P434_COMPRESSED_ECDH_NISTP256_SHA256, KEX_KEM_SIDH_P434_COMPRESSED_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P610_ECDH_NISTP384_SHA256, KEX_KEM_SIDH_P610_ECDH_NISTP384_SHA256, NID_secp384r1, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P610_COMPRESSED_ECDH_NISTP384_SHA256, KEX_KEM_SIDH_P610_COMPRESSED_ECDH_NISTP384_SHA256, NID_secp384r1, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P751_ECDH_NISTP521_SHA256, KEX_KEM_SIDH_P751_ECDH_NISTP521_SHA256, NID_secp521r1, SSH_DIGEST_SHA256 },
{ KEX_SIDH_P751_COMPRESSED_ECDH_NISTP521_SHA256, KEX_KEM_SIDH_P751_COMPRESSED_ECDH_NISTP521_SHA256, NID_secp521r1, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P434_ECDH_NISTP256_SHA256, KEX_KEM_SIKE_P434_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P434_COMPRESSED_ECDH_NISTP256_SHA256, KEX_KEM_SIKE_P434_COMPRESSED_ECDH_NISTP256_SHA256, NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P610_ECDH_NISTP384_SHA256, KEX_KEM_SIKE_P610_ECDH_NISTP384_SHA256, NID_secp384r1, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P610_COMPRESSED_ECDH_NISTP384_SHA256, KEX_KEM_SIKE_P610_COMPRESSED_ECDH_NISTP384_SHA256, NID_secp384r1, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P751_ECDH_NISTP521_SHA256, KEX_KEM_SIKE_P751_ECDH_NISTP521_SHA256, NID_secp521r1, SSH_DIGEST_SHA256 },
{ KEX_SIKE_P751_COMPRESSED_ECDH_NISTP521_SHA256, KEX_KEM_SIKE_P751_COMPRESSED_ECDH_NISTP521_SHA256, NID_secp521r1, SSH_DIGEST_SHA256 },
{ 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 },
Expand Down
Loading

0 comments on commit 63d0b31

Please sign in to comment.