diff --git a/oqs-sys/Cargo.toml b/oqs-sys/Cargo.toml index e0247df692..cce2061eda 100644 --- a/oqs-sys/Cargo.toml +++ b/oqs-sys/Cargo.toml @@ -28,21 +28,18 @@ openssl = [] docs = [] non_portable = [] # algorithms: KEMs -kems = ["classic_mceliece", "frodokem", "hqc", "kyber", "ntru", "ntruprime", "saber"] +kems = ["classic_mceliece", "frodokem", "hqc", "kyber", "ntru", "saber"] bike = [] # BIKE is enabled by build.rs on non-windows targets classic_mceliece = [] frodokem = [] hqc = [] kyber = [] ntru = [] -ntruprime = [] saber = [] # algorithms: Signature schemes -sigs = ["dilithium", "falcon", "picnic", "rainbow", "sphincs"] +sigs = ["dilithium", "falcon", "sphincs"] dilithium = [] falcon = [] -picnic = [] -rainbow = [] sphincs = [] [package.metadata.docs.rs] diff --git a/oqs-sys/liboqs b/oqs-sys/liboqs index e9cd9a5c55..c50d38e5a8 160000 --- a/oqs-sys/liboqs +++ b/oqs-sys/liboqs @@ -1 +1 @@ -Subproject commit e9cd9a5c5562530bc89199543ec5d195a535b695 +Subproject commit c50d38e5a816a8b69c9ec5bb4b1e99140911c5a5 diff --git a/oqs/Cargo.toml b/oqs/Cargo.toml index 5845531633..24df440b28 100644 --- a/oqs/Cargo.toml +++ b/oqs/Cargo.toml @@ -25,19 +25,16 @@ std = [] non_portable = ["oqs-sys/non_portable"] # algorithms: KEMs -kems = ["oqs-sys/kems", "classic_mceliece", "frodokem", "hqc", "kyber", "ntru", "ntruprime", "saber"] +kems = ["oqs-sys/kems", "classic_mceliece", "frodokem", "hqc", "kyber", "ntru", "saber"] bike = ["oqs-sys/bike"] # not supported on Windows or 32-bit ARM classic_mceliece = ["oqs-sys/classic_mceliece"] frodokem = ["oqs-sys/frodokem"] hqc = ["oqs-sys/hqc"] kyber = ["oqs-sys/kyber"] ntru = ["oqs-sys/ntru"] -ntruprime = ["oqs-sys/ntruprime"] saber = ["oqs-sys/saber"] # algorithms: Signature schemes -sigs = ["oqs-sys/sigs", "dilithium", "falcon", "picnic", "rainbow", "sphincs"] +sigs = ["oqs-sys/sigs", "dilithium", "falcon", "sphincs"] dilithium = ["oqs-sys/dilithium"] falcon = ["oqs-sys/falcon"] -picnic = ["oqs-sys/picnic"] -rainbow = ["oqs-sys/rainbow"] sphincs = ["oqs-sys/sphincs"] diff --git a/oqs/src/kem.rs b/oqs/src/kem.rs index 37822f7ca6..89223ef9f2 100644 --- a/oqs/src/kem.rs +++ b/oqs/src/kem.rs @@ -141,14 +141,6 @@ implement_kems! { ("ntru") NtruHps40961229: OQS_KEM_alg_ntru_hps40961229, ("ntru") NtruHrss701: OQS_KEM_alg_ntru_hrss701, ("ntru") NtruHrss1373: OQS_KEM_alg_ntru_hrss1373, - ("ntruprime") NtruPrimeNtrulpr653: OQS_KEM_alg_ntruprime_ntrulpr653, - ("ntruprime") NtruPrimeNtrulpr761: OQS_KEM_alg_ntruprime_ntrulpr761, - ("ntruprime") NtruPrimeNtrulpr857: OQS_KEM_alg_ntruprime_ntrulpr857, - ("ntruprime") NtruPrimeNtrulpr1277: OQS_KEM_alg_ntruprime_ntrulpr1277, - ("ntruprime") NtruPrimeSntrup653: OQS_KEM_alg_ntruprime_sntrup653, - ("ntruprime") NtruPrimeSntrup761: OQS_KEM_alg_ntruprime_sntrup761, - ("ntruprime") NtruPrimeSntrup857: OQS_KEM_alg_ntruprime_sntrup857, - ("ntruprime") NtruPrimeSntrup1277: OQS_KEM_alg_ntruprime_sntrup1277, ("saber") Lightsaber: OQS_KEM_alg_saber_lightsaber, ("saber") Saber: OQS_KEM_alg_saber_saber, ("saber") Firesaber: OQS_KEM_alg_saber_firesaber, diff --git a/oqs/src/sig.rs b/oqs/src/sig.rs index 92536f4f56..eb46081fc1 100644 --- a/oqs/src/sig.rs +++ b/oqs/src/sig.rs @@ -119,24 +119,6 @@ implement_sigs! { ("dilithium") Dilithium5: OQS_SIG_alg_dilithium_5, ("falcon") Falcon512: OQS_SIG_alg_falcon_512, ("falcon") Falcon1024: OQS_SIG_alg_falcon_1024, - ("picnic") Picnic3L1: OQS_SIG_alg_picnic3_L1, - ("picnic") Picnic3L3: OQS_SIG_alg_picnic3_L3, - ("picnic") Picnic3L5: OQS_SIG_alg_picnic3_L5, - ("picnic") PicnicL1Fs: OQS_SIG_alg_picnic_L1_FS, - ("picnic") PicnicL1Ur: OQS_SIG_alg_picnic_L1_UR, - ("picnic") PicnicL1Full: OQS_SIG_alg_picnic_L1_full, - ("picnic") PicnicL3Fs: OQS_SIG_alg_picnic_L3_FS, - ("picnic") PicnicL3Ur: OQS_SIG_alg_picnic_L3_UR, - ("picnic") PicnicL3Full: OQS_SIG_alg_picnic_L3_full, - ("picnic") PicnicL5Fs: OQS_SIG_alg_picnic_L5_FS, - ("picnic") PicnicL5Ur: OQS_SIG_alg_picnic_L5_UR, - ("picnic") PicnicL5Full: OQS_SIG_alg_picnic_L5_full, - ("rainbow") RainbowIiiClassic: OQS_SIG_alg_rainbow_III_classic, - ("rainbow") RainbowIiiCircumzenithal: OQS_SIG_alg_rainbow_III_circumzenithal, - ("rainbow") RainbowIiiCompressed: OQS_SIG_alg_rainbow_III_compressed, - ("rainbow") RainbowVClassic: OQS_SIG_alg_rainbow_V_classic, - ("rainbow") RainbowVCircumzenithal: OQS_SIG_alg_rainbow_V_circumzenithal, - ("rainbow") RainbowVCompressed: OQS_SIG_alg_rainbow_V_compressed, ("sphincs") SphincsHaraka128fRobust: OQS_SIG_alg_sphincs_haraka_128f_robust, ("sphincs") SphincsHaraka128fSimple: OQS_SIG_alg_sphincs_haraka_128f_simple, ("sphincs") SphincsHaraka128sRobust: OQS_SIG_alg_sphincs_haraka_128s_robust,