removing Picnic,NTRUprime,Rainbow,Saber

README.md

@@ -68,8 +68,6 @@ The following quantum-safe algorithms from liboqs are supported (assuming they h
 - **FrodoKEM**: `frodo640shake`, `frodo976aes`, `frodo976shake`, `frodo1344aes`, `frodo1344shake`
 - **HQC**: `hqc128`, `hqc192`, `hqc256`†
 - **NTRU**: `ntru_hps2048509`, `ntru_hps2048677`, `ntru_hps4096821`, `ntru_hps40961229`, `ntru_hrss701`, `ntru_hrss1373`
-- **NTRU-Prime**: `ntrulpr653`, `ntrulpr761`, `ntrulpr857`, `ntrulpr1277`, `sntrup653`, `sntrup761`, `sntrup857`, `sntrup1277`
-- **SABER**: `lightsaber`, `saber`, `firesaber`
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_KEXS_END -->
 
 For each `<KEX>` listed above, the following hybrid algorithms are made available as follows:
@@ -89,8 +87,6 @@ The following quantum-safe digital signature algorithms from liboqs are supporte
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_SIGS_START -->
 - **CRYSTALS-DILITHIUM**: `dilithium3`, `dilithium5`, `dilithium2_aes`, `dilithium3_aes`, `dilithium5_aes`
 - **Falcon**: `falcon512`, `falcon1024`
-- **Picnic**: `picnicl1fs`, `picnicl1ur`, `picnicl1full`, `picnic3l1`, `picnic3l3`, `picnic3l5`
-- **Rainbow**: `rainbowIIIclassic`, `rainbowIIIcircumzenithal`, `rainbowIIIcompressed`, `rainbowVclassic`, `rainbowVcircumzenithal`, `rainbowVcompressed`
 - **SPHINCS-Haraka**: `sphincsharaka128frobust`, `sphincsharaka128fsimple`, `sphincsharaka128srobust`, `sphincsharaka128ssimple`, `sphincsharaka192frobust`, `sphincsharaka192fsimple`, `sphincsharaka192srobust`, `sphincsharaka192ssimple`, `sphincsharaka256frobust`, `sphincsharaka256fsimple`, `sphincsharaka256srobust`, `sphincsharaka256ssimple`
 - **SPHINCS-SHA256**: `sphincssha256128frobust`, `sphincssha256128fsimple`, `sphincssha256128srobust`, `sphincssha256128ssimple`, `sphincssha256192frobust`, `sphincssha256192fsimple`, `sphincssha256192srobust`, `sphincssha256192ssimple`, `sphincssha256256frobust`, `sphincssha256256fsimple`, `sphincssha256256srobust`, `sphincssha256256ssimple`
 - **SPHINCS-SHAKE256**: `sphincsshake256128frobust`, `sphincsshake256128fsimple`, `sphincsshake256128srobust`, `sphincsshake256128ssimple`, `sphincsshake256192frobust`, `sphincsshake256192fsimple`, `sphincsshake256192srobust`, `sphincsshake256192ssimple`, `sphincsshake256256frobust`, `sphincsshake256256fsimple`, `sphincsshake256256srobust`, `sphincsshake256256ssimple`

crypto/evp/evp.c

@@ -231,30 +231,6 @@ static const EVP_PKEY_ASN1_METHOD *evp_pkey_asn1_find(int nid) {
       return &falcon512_asn1_meth;
     case EVP_PKEY_FALCON1024:
       return &falcon1024_asn1_meth;
-    case EVP_PKEY_PICNICL1FS:
-      return &picnicl1fs_asn1_meth;
-    case EVP_PKEY_PICNICL1UR:
-      return &picnicl1ur_asn1_meth;
-    case EVP_PKEY_PICNICL1FULL:
-      return &picnicl1full_asn1_meth;
-    case EVP_PKEY_PICNIC3L1:
-      return &picnic3l1_asn1_meth;
-    case EVP_PKEY_PICNIC3L3:
-      return &picnic3l3_asn1_meth;
-    case EVP_PKEY_PICNIC3L5:
-      return &picnic3l5_asn1_meth;
-    case EVP_PKEY_RAINBOWIIICLASSIC:
-      return &rainbowIIIclassic_asn1_meth;
-    case EVP_PKEY_RAINBOWIIICIRCUMZENITHAL:
-      return &rainbowIIIcircumzenithal_asn1_meth;
-    case EVP_PKEY_RAINBOWIIICOMPRESSED:
-      return &rainbowIIIcompressed_asn1_meth;
-    case EVP_PKEY_RAINBOWVCLASSIC:
-      return &rainbowVclassic_asn1_meth;
-    case EVP_PKEY_RAINBOWVCIRCUMZENITHAL:
-      return &rainbowVcircumzenithal_asn1_meth;
-    case EVP_PKEY_RAINBOWVCOMPRESSED:
-      return &rainbowVcompressed_asn1_meth;
     case EVP_PKEY_SPHINCSHARAKA128FROBUST:
       return &sphincsharaka128frobust_asn1_meth;
     case EVP_PKEY_SPHINCSHARAKA128FSIMPLE:

crypto/evp/evp_asn1.c

@@ -83,18 +83,6 @@ static const EVP_PKEY_ASN1_METHOD *const kASN1Methods[] = {
     &dilithium5_aes_asn1_meth,
     &falcon512_asn1_meth,
     &falcon1024_asn1_meth,
-    &picnicl1fs_asn1_meth,
-    &picnicl1ur_asn1_meth,
-    &picnicl1full_asn1_meth,
-    &picnic3l1_asn1_meth,
-    &picnic3l3_asn1_meth,
-    &picnic3l5_asn1_meth,
-    &rainbowIIIclassic_asn1_meth,
-    &rainbowIIIcircumzenithal_asn1_meth,
-    &rainbowIIIcompressed_asn1_meth,
-    &rainbowVclassic_asn1_meth,
-    &rainbowVcircumzenithal_asn1_meth,
-    &rainbowVcompressed_asn1_meth,
     &sphincsharaka128frobust_asn1_meth,
     &sphincsharaka128fsimple_asn1_meth,
     &sphincsharaka128srobust_asn1_meth,

crypto/evp/evp_ctx.c

@@ -79,18 +79,6 @@ static const EVP_PKEY_METHOD *const evp_methods[] = {
     &dilithium5_aes_pkey_meth,
     &falcon512_pkey_meth,
     &falcon1024_pkey_meth,
-    &picnicl1fs_pkey_meth,
-    &picnicl1ur_pkey_meth,
-    &picnicl1full_pkey_meth,
-    &picnic3l1_pkey_meth,
-    &picnic3l3_pkey_meth,
-    &picnic3l5_pkey_meth,
-    &rainbowIIIclassic_pkey_meth,
-    &rainbowIIIcircumzenithal_pkey_meth,
-    &rainbowIIIcompressed_pkey_meth,
-    &rainbowVclassic_pkey_meth,
-    &rainbowVcircumzenithal_pkey_meth,
-    &rainbowVcompressed_pkey_meth,
     &sphincsharaka128frobust_pkey_meth,
     &sphincsharaka128fsimple_pkey_meth,
     &sphincsharaka128srobust_pkey_meth,

crypto/evp/internal.h

@@ -276,18 +276,6 @@ extern const EVP_PKEY_ASN1_METHOD dilithium3_aes_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD dilithium5_aes_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD falcon512_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD falcon1024_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD picnicl1fs_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD picnicl1ur_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD picnicl1full_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD picnic3l1_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD picnic3l3_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD picnic3l5_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD rainbowIIIclassic_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD rainbowIIIcircumzenithal_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD rainbowIIIcompressed_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD rainbowVclassic_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD rainbowVcircumzenithal_asn1_meth;
-extern const EVP_PKEY_ASN1_METHOD rainbowVcompressed_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD sphincsharaka128frobust_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD sphincsharaka128fsimple_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD sphincsharaka128srobust_asn1_meth;
@@ -339,18 +327,6 @@ extern const EVP_PKEY_METHOD dilithium3_aes_pkey_meth;
 extern const EVP_PKEY_METHOD dilithium5_aes_pkey_meth;
 extern const EVP_PKEY_METHOD falcon512_pkey_meth;
 extern const EVP_PKEY_METHOD falcon1024_pkey_meth;
-extern const EVP_PKEY_METHOD picnicl1fs_pkey_meth;
-extern const EVP_PKEY_METHOD picnicl1ur_pkey_meth;
-extern const EVP_PKEY_METHOD picnicl1full_pkey_meth;
-extern const EVP_PKEY_METHOD picnic3l1_pkey_meth;
-extern const EVP_PKEY_METHOD picnic3l3_pkey_meth;
-extern const EVP_PKEY_METHOD picnic3l5_pkey_meth;
-extern const EVP_PKEY_METHOD rainbowIIIclassic_pkey_meth;
-extern const EVP_PKEY_METHOD rainbowIIIcircumzenithal_pkey_meth;
-extern const EVP_PKEY_METHOD rainbowIIIcompressed_pkey_meth;
-extern const EVP_PKEY_METHOD rainbowVclassic_pkey_meth;
-extern const EVP_PKEY_METHOD rainbowVcircumzenithal_pkey_meth;
-extern const EVP_PKEY_METHOD rainbowVcompressed_pkey_meth;
 extern const EVP_PKEY_METHOD sphincsharaka128frobust_pkey_meth;
 extern const EVP_PKEY_METHOD sphincsharaka128fsimple_pkey_meth;
 extern const EVP_PKEY_METHOD sphincsharaka128srobust_pkey_meth;

crypto/evp/p_oqs.c

@@ -142,18 +142,6 @@ DEFINE_OQS_PKEY_METHODS(dilithium3_aes, OQS_SIG_alg_dilithium_3_aes, EVP_PKEY_DI
 DEFINE_OQS_PKEY_METHODS(dilithium5_aes, OQS_SIG_alg_dilithium_5_aes, EVP_PKEY_DILITHIUM5_AES)
 DEFINE_OQS_PKEY_METHODS(falcon512, OQS_SIG_alg_falcon_512, EVP_PKEY_FALCON512)
 DEFINE_OQS_PKEY_METHODS(falcon1024, OQS_SIG_alg_falcon_1024, EVP_PKEY_FALCON1024)
-DEFINE_OQS_PKEY_METHODS(picnicl1fs, OQS_SIG_alg_picnic_L1_FS, EVP_PKEY_PICNICL1FS)
-DEFINE_OQS_PKEY_METHODS(picnicl1ur, OQS_SIG_alg_picnic_L1_UR, EVP_PKEY_PICNICL1UR)
-DEFINE_OQS_PKEY_METHODS(picnicl1full, OQS_SIG_alg_picnic_L1_full, EVP_PKEY_PICNICL1FULL)
-DEFINE_OQS_PKEY_METHODS(picnic3l1, OQS_SIG_alg_picnic3_L1, EVP_PKEY_PICNIC3L1)
-DEFINE_OQS_PKEY_METHODS(picnic3l3, OQS_SIG_alg_picnic3_L3, EVP_PKEY_PICNIC3L3)
-DEFINE_OQS_PKEY_METHODS(picnic3l5, OQS_SIG_alg_picnic3_L5, EVP_PKEY_PICNIC3L5)
-DEFINE_OQS_PKEY_METHODS(rainbowIIIclassic, OQS_SIG_alg_rainbow_III_classic, EVP_PKEY_RAINBOWIIICLASSIC)
-DEFINE_OQS_PKEY_METHODS(rainbowIIIcircumzenithal, OQS_SIG_alg_rainbow_III_circumzenithal, EVP_PKEY_RAINBOWIIICIRCUMZENITHAL)
-DEFINE_OQS_PKEY_METHODS(rainbowIIIcompressed, OQS_SIG_alg_rainbow_III_compressed, EVP_PKEY_RAINBOWIIICOMPRESSED)
-DEFINE_OQS_PKEY_METHODS(rainbowVclassic, OQS_SIG_alg_rainbow_V_classic, EVP_PKEY_RAINBOWVCLASSIC)
-DEFINE_OQS_PKEY_METHODS(rainbowVcircumzenithal, OQS_SIG_alg_rainbow_V_circumzenithal, EVP_PKEY_RAINBOWVCIRCUMZENITHAL)
-DEFINE_OQS_PKEY_METHODS(rainbowVcompressed, OQS_SIG_alg_rainbow_V_compressed, EVP_PKEY_RAINBOWVCOMPRESSED)
 DEFINE_OQS_PKEY_METHODS(sphincsharaka128frobust, OQS_SIG_alg_sphincs_haraka_128f_robust, EVP_PKEY_SPHINCSHARAKA128FROBUST)
 DEFINE_OQS_PKEY_METHODS(sphincsharaka128fsimple, OQS_SIG_alg_sphincs_haraka_128f_simple, EVP_PKEY_SPHINCSHARAKA128FSIMPLE)
 DEFINE_OQS_PKEY_METHODS(sphincsharaka128srobust, OQS_SIG_alg_sphincs_haraka_128s_robust, EVP_PKEY_SPHINCSHARAKA128SROBUST)

crypto/evp/p_oqs_asn1.c

@@ -241,42 +241,6 @@ DEFINE_OQS_PKEY_ASN1_METHOD(falcon512, EVP_PKEY_FALCON512, OID(0x2B, 0xCE, 0x0F,
 DEFINE_OQS_ASN1_METHODS(falcon1024, OQS_SIG_alg_falcon_1024, EVP_PKEY_FALCON1024)
 DEFINE_OQS_PKEY_ASN1_METHOD(falcon1024, EVP_PKEY_FALCON1024, OID(0x2B, 0xCE, 0x0F, 0x03, 0x04))
 
-DEFINE_OQS_ASN1_METHODS(picnicl1fs, OQS_SIG_alg_picnic_L1_FS, EVP_PKEY_PICNICL1FS)
-DEFINE_OQS_PKEY_ASN1_METHOD(picnicl1fs, EVP_PKEY_PICNICL1FS, OID(0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x59, 0x02, 0x01, 0x01))
-
-DEFINE_OQS_ASN1_METHODS(picnicl1ur, OQS_SIG_alg_picnic_L1_UR, EVP_PKEY_PICNICL1UR)
-DEFINE_OQS_PKEY_ASN1_METHOD(picnicl1ur, EVP_PKEY_PICNICL1UR, OID(0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x59, 0x02, 0x01, 0x04))
-
-DEFINE_OQS_ASN1_METHODS(picnicl1full, OQS_SIG_alg_picnic_L1_full, EVP_PKEY_PICNICL1FULL)
-DEFINE_OQS_PKEY_ASN1_METHOD(picnicl1full, EVP_PKEY_PICNICL1FULL, OID(0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x59, 0x02, 0x01, 0x07))
-
-DEFINE_OQS_ASN1_METHODS(picnic3l1, OQS_SIG_alg_picnic3_L1, EVP_PKEY_PICNIC3L1)
-DEFINE_OQS_PKEY_ASN1_METHOD(picnic3l1, EVP_PKEY_PICNIC3L1, OID(0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x59, 0x02, 0x01, 0x15))
-
-DEFINE_OQS_ASN1_METHODS(picnic3l3, OQS_SIG_alg_picnic3_L3, EVP_PKEY_PICNIC3L3)
-DEFINE_OQS_PKEY_ASN1_METHOD(picnic3l3, EVP_PKEY_PICNIC3L3, OID(0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x59, 0x02, 0x01, 0x18))
-
-DEFINE_OQS_ASN1_METHODS(picnic3l5, OQS_SIG_alg_picnic3_L5, EVP_PKEY_PICNIC3L5)
-DEFINE_OQS_PKEY_ASN1_METHOD(picnic3l5, EVP_PKEY_PICNIC3L5, OID(0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x59, 0x02, 0x01, 0x1a))
-
-DEFINE_OQS_ASN1_METHODS(rainbowIIIclassic, OQS_SIG_alg_rainbow_III_classic, EVP_PKEY_RAINBOWIIICLASSIC)
-DEFINE_OQS_PKEY_ASN1_METHOD(rainbowIIIclassic, EVP_PKEY_RAINBOWIIICLASSIC, OID(0x2B, 0xCE, 0x0F, 0x05, 0x02, 0x01, 0x01))
-
-DEFINE_OQS_ASN1_METHODS(rainbowIIIcircumzenithal, OQS_SIG_alg_rainbow_III_circumzenithal, EVP_PKEY_RAINBOWIIICIRCUMZENITHAL)
-DEFINE_OQS_PKEY_ASN1_METHOD(rainbowIIIcircumzenithal, EVP_PKEY_RAINBOWIIICIRCUMZENITHAL, OID(0x2B, 0xCE, 0x0F, 0x05, 0x02, 0x03, 0x01))
-
-DEFINE_OQS_ASN1_METHODS(rainbowIIIcompressed, OQS_SIG_alg_rainbow_III_compressed, EVP_PKEY_RAINBOWIIICOMPRESSED)
-DEFINE_OQS_PKEY_ASN1_METHOD(rainbowIIIcompressed, EVP_PKEY_RAINBOWIIICOMPRESSED, OID(0x2B, 0xCE, 0x0F, 0x05, 0x02, 0x05, 0x01))
-
-DEFINE_OQS_ASN1_METHODS(rainbowVclassic, OQS_SIG_alg_rainbow_V_classic, EVP_PKEY_RAINBOWVCLASSIC)
-DEFINE_OQS_PKEY_ASN1_METHOD(rainbowVclassic, EVP_PKEY_RAINBOWVCLASSIC, OID(0x2B, 0xCE, 0x0F, 0x05, 0x03, 0x01, 0x01))
-
-DEFINE_OQS_ASN1_METHODS(rainbowVcircumzenithal, OQS_SIG_alg_rainbow_V_circumzenithal, EVP_PKEY_RAINBOWVCIRCUMZENITHAL)
-DEFINE_OQS_PKEY_ASN1_METHOD(rainbowVcircumzenithal, EVP_PKEY_RAINBOWVCIRCUMZENITHAL, OID(0x2B, 0xCE, 0x0F, 0x05, 0x03, 0x03, 0x01))
-
-DEFINE_OQS_ASN1_METHODS(rainbowVcompressed, OQS_SIG_alg_rainbow_V_compressed, EVP_PKEY_RAINBOWVCOMPRESSED)
-DEFINE_OQS_PKEY_ASN1_METHOD(rainbowVcompressed, EVP_PKEY_RAINBOWVCOMPRESSED, OID(0x2B, 0xCE, 0x0F, 0x05, 0x03, 0x05, 0x01))
-
 DEFINE_OQS_ASN1_METHODS(sphincsharaka128frobust, OQS_SIG_alg_sphincs_haraka_128f_robust, EVP_PKEY_SPHINCSHARAKA128FROBUST)
 DEFINE_OQS_PKEY_ASN1_METHOD(sphincsharaka128frobust, EVP_PKEY_SPHINCSHARAKA128FROBUST, OID(0x2B, 0xCE, 0x0F, 0x06, 0x01, 0x01))
 

crypto/obj/obj_xref.c

@@ -98,18 +98,6 @@ static const nid_triple kTriples[] = {
     {NID_dilithium5_aes, NID_sha512, NID_dilithium5_aes},
     {NID_falcon512, NID_sha256, NID_falcon512},
     {NID_falcon1024, NID_sha512, NID_falcon1024},
-    {NID_picnicl1fs, NID_sha256, NID_picnicl1fs},
-    {NID_picnicl1ur, NID_sha256, NID_picnicl1ur},
-    {NID_picnicl1full, NID_sha256, NID_picnicl1full},
-    {NID_picnic3l1, NID_sha256, NID_picnic3l1},
-    {NID_picnic3l3, NID_sha384, NID_picnic3l3},
-    {NID_picnic3l5, NID_sha512, NID_picnic3l5},
-    {NID_rainbowIIIclassic, NID_sha384, NID_rainbowIIIclassic},
-    {NID_rainbowIIIcircumzenithal, NID_sha384, NID_rainbowIIIcircumzenithal},
-    {NID_rainbowIIIcompressed, NID_sha384, NID_rainbowIIIcompressed},
-    {NID_rainbowVclassic, NID_sha512, NID_rainbowVclassic},
-    {NID_rainbowVcircumzenithal, NID_sha512, NID_rainbowVcircumzenithal},
-    {NID_rainbowVcompressed, NID_sha512, NID_rainbowVcompressed},
     {NID_sphincsharaka128frobust, NID_sha256, NID_sphincsharaka128frobust},
     {NID_sphincsharaka128fsimple, NID_sha256, NID_sphincsharaka128fsimple},
     {NID_sphincsharaka128srobust, NID_sha256, NID_sphincsharaka128srobust},

crypto/obj/objects.txt

@@ -1392,12 +1392,6 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
  : p384_ntru_hrss701
  : ntru_hrss1373
  : p521_ntru_hrss1373
- : lightsaber
- : p256_lightsaber
- : saber
- : p384_saber
- : firesaber
- : p521_firesaber
  : kyber90s512
  : p256_kyber90s512
  : kyber90s768
@@ -1410,22 +1404,6 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
  : p384_hqc192
  : hqc256
  : p521_hqc256
- : ntrulpr653
- : p256_ntrulpr653
- : ntrulpr761
- : p256_ntrulpr761
- : ntrulpr857
- : p384_ntrulpr857
- : ntrulpr1277
- : p521_ntrulpr1277
- : sntrup653
- : p256_sntrup653
- : sntrup761
- : p256_sntrup761
- : sntrup857
- : p384_sntrup857
- : sntrup1277
- : p521_sntrup1277
 ##### OQS_TEMPLATE_FRAGMENT_DEF_NIDS_END
 
 ##### OQS_TEMPLATE_FRAGMENT_ASSIGN_OIDS_START
@@ -1437,18 +1415,6 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
 1 3 6 1 4 1 2 267 11 8 7 : dilithium5_aes : dilithium5_aes
 1 3 9999 3 1 : falcon512 : falcon512
 1 3 9999 3 4 : falcon1024 : falcon1024
-1 3 6 1 4 1 311 89 2 1 1 : picnicl1fs : picnicl1fs
-1 3 6 1 4 1 311 89 2 1 4 : picnicl1ur : picnicl1ur
-1 3 6 1 4 1 311 89 2 1 7 : picnicl1full : picnicl1full
-1 3 6 1 4 1 311 89 2 1 21 : picnic3l1 : picnic3l1
-1 3 6 1 4 1 311 89 2 1 24 : picnic3l3 : picnic3l3
-1 3 6 1 4 1 311 89 2 1 26 : picnic3l5 : picnic3l5
-1 3 9999 5 2 1 1 : rainbowIIIclassic : rainbowIIIclassic
-1 3 9999 5 2 3 1 : rainbowIIIcircumzenithal : rainbowIIIcircumzenithal
-1 3 9999 5 2 5 1 : rainbowIIIcompressed : rainbowIIIcompressed
-1 3 9999 5 3 1 1 : rainbowVclassic : rainbowVclassic
-1 3 9999 5 3 3 1 : rainbowVcircumzenithal : rainbowVcircumzenithal
-1 3 9999 5 3 5 1 : rainbowVcompressed : rainbowVcompressed
 1 3 9999 6 1 1 : sphincsharaka128frobust : sphincsharaka128frobust
 1 3 9999 6 1 4 : sphincsharaka128fsimple : sphincsharaka128fsimple
 1 3 9999 6 1 7 : sphincsharaka128srobust : sphincsharaka128srobust

crypto/x509/algorithm.c

@@ -94,18 +94,6 @@ int x509_digest_sign_algorithm(EVP_MD_CTX *ctx, X509_ALGOR *algor) {
       pkey_id == EVP_PKEY_DILITHIUM5_AES ||
       pkey_id == EVP_PKEY_FALCON512 ||
       pkey_id == EVP_PKEY_FALCON1024 ||
-      pkey_id == EVP_PKEY_PICNICL1FS ||
-      pkey_id == EVP_PKEY_PICNICL1UR ||
-      pkey_id == EVP_PKEY_PICNICL1FULL ||
-      pkey_id == EVP_PKEY_PICNIC3L1 ||
-      pkey_id == EVP_PKEY_PICNIC3L3 ||
-      pkey_id == EVP_PKEY_PICNIC3L5 ||
-      pkey_id == EVP_PKEY_RAINBOWIIICLASSIC ||
-      pkey_id == EVP_PKEY_RAINBOWIIICIRCUMZENITHAL ||
-      pkey_id == EVP_PKEY_RAINBOWIIICOMPRESSED ||
-      pkey_id == EVP_PKEY_RAINBOWVCLASSIC ||
-      pkey_id == EVP_PKEY_RAINBOWVCIRCUMZENITHAL ||
-      pkey_id == EVP_PKEY_RAINBOWVCOMPRESSED ||
       pkey_id == EVP_PKEY_SPHINCSHARAKA128FROBUST ||
       pkey_id == EVP_PKEY_SPHINCSHARAKA128FSIMPLE ||
       pkey_id == EVP_PKEY_SPHINCSHARAKA128SROBUST ||

include/openssl/evp.h

@@ -188,18 +188,6 @@ OPENSSL_EXPORT EC_KEY *EVP_PKEY_get1_EC_KEY(const EVP_PKEY *pkey);
 #define EVP_PKEY_DILITHIUM5_AES NID_dilithium5_aes
 #define EVP_PKEY_FALCON512 NID_falcon512
 #define EVP_PKEY_FALCON1024 NID_falcon1024
-#define EVP_PKEY_PICNICL1FS NID_picnicl1fs
-#define EVP_PKEY_PICNICL1UR NID_picnicl1ur
-#define EVP_PKEY_PICNICL1FULL NID_picnicl1full
-#define EVP_PKEY_PICNIC3L1 NID_picnic3l1
-#define EVP_PKEY_PICNIC3L3 NID_picnic3l3
-#define EVP_PKEY_PICNIC3L5 NID_picnic3l5
-#define EVP_PKEY_RAINBOWIIICLASSIC NID_rainbowIIIclassic
-#define EVP_PKEY_RAINBOWIIICIRCUMZENITHAL NID_rainbowIIIcircumzenithal
-#define EVP_PKEY_RAINBOWIIICOMPRESSED NID_rainbowIIIcompressed
-#define EVP_PKEY_RAINBOWVCLASSIC NID_rainbowVclassic
-#define EVP_PKEY_RAINBOWVCIRCUMZENITHAL NID_rainbowVcircumzenithal
-#define EVP_PKEY_RAINBOWVCOMPRESSED NID_rainbowVcompressed
 #define EVP_PKEY_SPHINCSHARAKA128FROBUST NID_sphincsharaka128frobust
 #define EVP_PKEY_SPHINCSHARAKA128FSIMPLE NID_sphincsharaka128fsimple
 #define EVP_PKEY_SPHINCSHARAKA128SROBUST NID_sphincsharaka128srobust
@@ -246,18 +234,6 @@ OPENSSL_EXPORT EC_KEY *EVP_PKEY_get1_EC_KEY(const EVP_PKEY *pkey);
    (pkey_id == NID_dilithium5_aes) || \
    (pkey_id == NID_falcon512) || \
    (pkey_id == NID_falcon1024) || \
-   (pkey_id == NID_picnicl1fs) || \
-   (pkey_id == NID_picnicl1ur) || \
-   (pkey_id == NID_picnicl1full) || \
-   (pkey_id == NID_picnic3l1) || \
-   (pkey_id == NID_picnic3l3) || \
-   (pkey_id == NID_picnic3l5) || \
-   (pkey_id == NID_rainbowIIIclassic) || \
-   (pkey_id == NID_rainbowIIIcircumzenithal) || \
-   (pkey_id == NID_rainbowIIIcompressed) || \
-   (pkey_id == NID_rainbowVclassic) || \
-   (pkey_id == NID_rainbowVcircumzenithal) || \
-   (pkey_id == NID_rainbowVcompressed) || \
    (pkey_id == NID_sphincsharaka128frobust) || \
    (pkey_id == NID_sphincsharaka128fsimple) || \
    (pkey_id == NID_sphincsharaka128srobust) || \
@@ -311,23 +287,12 @@ OPENSSL_EXPORT EC_KEY *EVP_PKEY_get1_EC_KEY(const EVP_PKEY *pkey);
    (pkey_id == NID_ntru_hps40961229) || \
    (pkey_id == NID_ntru_hrss701) || \
    (pkey_id == NID_ntru_hrss1373) || \
-   (pkey_id == NID_lightsaber) || \
-   (pkey_id == NID_saber) || \
-   (pkey_id == NID_firesaber) || \
    (pkey_id == NID_kyber90s512) || \
    (pkey_id == NID_kyber90s768) || \
    (pkey_id == NID_kyber90s1024) || \
    (pkey_id == NID_hqc128) || \
    (pkey_id == NID_hqc192) || \
    (pkey_id == NID_hqc256) || \
-   (pkey_id == NID_ntrulpr653) || \
-   (pkey_id == NID_ntrulpr761) || \
-   (pkey_id == NID_ntrulpr857) || \
-   (pkey_id == NID_ntrulpr1277) || \
-   (pkey_id == NID_sntrup653) || \
-   (pkey_id == NID_sntrup761) || \
-   (pkey_id == NID_sntrup857) || \
-   (pkey_id == NID_sntrup1277) || \
 0 )
 ///// OQS_TEMPLATE_FRAGMENT_DEFINE_EVP_PKEYS_END