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

README.md

@@ -80,8 +80,6 @@ The following quantum-safe algorithms from liboqs are supported (assuming they h
 - **FrodoKEM**: `frodo640aes`, `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 -->
 
 If ``<KEX>`` is any of the algorithms listed above, the following hybrid algorithms are supported:
@@ -101,8 +99,6 @@ The following digital signature algorithms from liboqs are supported by the fork
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_SIGS_START -->
 - **CRYSTALS-Dilithium**:`dilithium2`\*, `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`

apps/s_cb.c

@@ -290,22 +290,6 @@ static const char *get_sigtype(int nid)
         return "Falcon-1024";
     case NID_p521_falcon1024:
         return "ECDSA p521 - Falcon-1024";
-    case NID_picnicl1full:
-        return "Picnic L1 full";
-    case NID_p256_picnicl1full:
-        return "ECDSA p256 - Picnic L1 full";
-    case NID_rsa3072_picnicl1full:
-        return "RSA3072 - Picnic L1 full";
-    case NID_picnic3l1:
-        return "Picnic3 L1";
-    case NID_p256_picnic3l1:
-        return "ECDSA p256 - Picnic3 L1";
-    case NID_rsa3072_picnic3l1:
-        return "RSA3072 - Picnic3 L1";
-    case NID_rainbowVclassic:
-        return "Rainbow-V-Classic";
-    case NID_p521_rainbowVclassic:
-        return "ECDSA p521 - Rainbow-V-Classic";
     case NID_sphincsharaka128frobust:
         return "SPHINCS+-Haraka-128f-robust";
     case NID_p256_sphincsharaka128frobust:
@@ -492,9 +476,6 @@ static const char* OQS_CURVE_ID_NAME_STR(int id) {
   case 0x0245: return "ntru_hps40961229";
   case 0x0217: return "ntru_hrss701";
   case 0x0246: return "ntru_hrss1373";
-  case 0x0218: return "lightsaber";
-  case 0x0219: return "saber";
-  case 0x021A: return "firesaber";
   case 0x0238: return "bikel1";
   case 0x023B: return "bikel3";
   case 0x023E: return "kyber90s512";
@@ -503,14 +484,6 @@ static const char* OQS_CURVE_ID_NAME_STR(int id) {
   case 0x022C: return "hqc128";
   case 0x022D: return "hqc192";
   case 0x022E: return "hqc256";
-  case 0x022F: return "ntrulpr653";
-  case 0x0230: return "ntrulpr761";
-  case 0x0231: return "ntrulpr857";
-  case 0x0241: return "ntrulpr1277";
-  case 0x0232: return "sntrup653";
-  case 0x0233: return "sntrup761";
-  case 0x0234: return "sntrup857";
-  case 0x0242: return "sntrup1277";
   ///// OQS_TEMPLATE_FRAGMENT_OQS_CURVE_ID_NAME_STR_END
   ///// OQS_TEMPLATE_FRAGMENT_OQS_CURVE_ID_NAME_STR_HYBRID_START
    case 0x2F00: return "p256_frodo640aes hybrid";
@@ -528,9 +501,6 @@ static const char* OQS_CURVE_ID_NAME_STR(int id) {
    case 0x2F45: return "p521_ntru_hps40961229 hybrid";
    case 0x2F17: return "p384_ntru_hrss701 hybrid";
    case 0x2F46: return "p521_ntru_hrss1373 hybrid";
-   case 0x2F18: return "p256_lightsaber hybrid";
-   case 0x2F19: return "p384_saber hybrid";
-   case 0x2F1A: return "p521_firesaber hybrid";
    case 0x2F38: return "p256_bikel1 hybrid";
    case 0x2F3B: return "p384_bikel3 hybrid";
    case 0x2F3E: return "p256_kyber90s512 hybrid";
@@ -539,14 +509,6 @@ static const char* OQS_CURVE_ID_NAME_STR(int id) {
    case 0x2F2C: return "p256_hqc128 hybrid";
    case 0x2F2D: return "p384_hqc192 hybrid";
    case 0x2F2E: return "p521_hqc256 hybrid";
-   case 0x2F2F: return "p256_ntrulpr653 hybrid";
-   case 0x2F43: return "p256_ntrulpr761 hybrid";
-   case 0x2F31: return "p384_ntrulpr857 hybrid";
-   case 0x2F41: return "p521_ntrulpr1277 hybrid";
-   case 0x2F32: return "p256_sntrup653 hybrid";
-   case 0x2F44: return "p256_sntrup761 hybrid";
-   case 0x2F34: return "p384_sntrup857 hybrid";
-   case 0x2F42: return "p521_sntrup1277 hybrid";
   ///// OQS_TEMPLATE_FRAGMENT_OQS_CURVE_ID_NAME_STR_HYBRID_END
   default: return "";
   }

crypto/asn1/standard_methods.h

@@ -79,14 +79,6 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = {
     &rsa3072_falcon512_asn1_meth,
     &falcon1024_asn1_meth,
     &p521_falcon1024_asn1_meth,
-    &picnicl1full_asn1_meth,
-    &p256_picnicl1full_asn1_meth,
-    &rsa3072_picnicl1full_asn1_meth,
-    &picnic3l1_asn1_meth,
-    &p256_picnic3l1_asn1_meth,
-    &rsa3072_picnic3l1_asn1_meth,
-    &rainbowVclassic_asn1_meth,
-    &p521_rainbowVclassic_asn1_meth,
     &sphincsharaka128frobust_asn1_meth,
     &p256_sphincsharaka128frobust_asn1_meth,
     &rsa3072_sphincsharaka128frobust_asn1_meth,

crypto/ec/oqs_meth.c

@@ -95,14 +95,6 @@ int oqssl_sig_nids_list[] = {
         NID_rsa3072_falcon512,
         NID_falcon1024,
         NID_p521_falcon1024,
-        NID_picnicl1full,
-        NID_p256_picnicl1full,
-        NID_rsa3072_picnicl1full,
-        NID_picnic3l1,
-        NID_p256_picnic3l1,
-        NID_rsa3072_picnic3l1,
-        NID_rainbowVclassic,
-        NID_p521_rainbowVclassic,
         NID_sphincsharaka128frobust,
         NID_p256_sphincsharaka128frobust,
         NID_rsa3072_sphincsharaka128frobust,
@@ -132,9 +124,6 @@ int oqssl_kem_nids_list[] = {
         NID_ntru_hps40961229,
         NID_ntru_hrss701,
         NID_ntru_hrss1373,
-        NID_lightsaber,
-        NID_saber,
-        NID_firesaber,
         NID_bikel1,
         NID_bikel3,
         NID_kyber90s512,
@@ -143,14 +132,6 @@ int oqssl_kem_nids_list[] = {
         NID_hqc128,
         NID_hqc192,
         NID_hqc256,
-        NID_ntrulpr653,
-        NID_ntrulpr761,
-        NID_ntrulpr857,
-        NID_ntrulpr1277,
-        NID_sntrup653,
-        NID_sntrup761,
-        NID_sntrup857,
-        NID_sntrup1277,
 /////// OQS_TEMPLATE_FRAGMENT_LIST_KNOWN_KEM_NIDS_END
 };
 
@@ -208,17 +189,6 @@ char* get_oqs_alg_name(int openssl_nid)
     case NID_falcon1024:
     case NID_p521_falcon1024:
       return OQS_SIG_alg_falcon_1024;
-    case NID_picnicl1full:
-    case NID_p256_picnicl1full:
-    case NID_rsa3072_picnicl1full:
-      return OQS_SIG_alg_picnic_L1_full;
-    case NID_picnic3l1:
-    case NID_p256_picnic3l1:
-    case NID_rsa3072_picnic3l1:
-      return OQS_SIG_alg_picnic3_L1;
-    case NID_rainbowVclassic:
-    case NID_p521_rainbowVclassic:
-      return OQS_SIG_alg_rainbow_V_classic;
     case NID_sphincsharaka128frobust:
     case NID_p256_sphincsharaka128frobust:
     case NID_rsa3072_sphincsharaka128frobust:
@@ -276,15 +246,6 @@ char* get_oqs_alg_name(int openssl_nid)
     case NID_ntru_hrss1373:
     case NID_p521_ntru_hrss1373:
       return OQS_KEM_alg_ntru_hrss1373;
-    case NID_lightsaber:
-    case NID_p256_lightsaber:
-      return OQS_KEM_alg_saber_lightsaber;
-    case NID_saber:
-    case NID_p384_saber:
-      return OQS_KEM_alg_saber_saber;
-    case NID_firesaber:
-    case NID_p521_firesaber:
-      return OQS_KEM_alg_saber_firesaber;
     case NID_bikel1:
     case NID_p256_bikel1:
       return OQS_KEM_alg_bike_l1;
@@ -309,30 +270,6 @@ char* get_oqs_alg_name(int openssl_nid)
     case NID_hqc256:
     case NID_p521_hqc256:
       return OQS_KEM_alg_hqc_256;
-    case NID_ntrulpr653:
-    case NID_p256_ntrulpr653:
-      return OQS_KEM_alg_ntruprime_ntrulpr653;
-    case NID_ntrulpr761:
-    case NID_p256_ntrulpr761:
-      return OQS_KEM_alg_ntruprime_ntrulpr761;
-    case NID_ntrulpr857:
-    case NID_p384_ntrulpr857:
-      return OQS_KEM_alg_ntruprime_ntrulpr857;
-    case NID_ntrulpr1277:
-    case NID_p521_ntrulpr1277:
-      return OQS_KEM_alg_ntruprime_ntrulpr1277;
-    case NID_sntrup653:
-    case NID_p256_sntrup653:
-      return OQS_KEM_alg_ntruprime_sntrup653;
-    case NID_sntrup761:
-    case NID_p256_sntrup761:
-      return OQS_KEM_alg_ntruprime_sntrup761;
-    case NID_sntrup857:
-    case NID_p384_sntrup857:
-      return OQS_KEM_alg_ntruprime_sntrup857;
-    case NID_sntrup1277:
-    case NID_p521_sntrup1277:
-      return OQS_KEM_alg_ntruprime_sntrup1277;
 ///// OQS_TEMPLATE_FRAGMENT_ASSIGN_SIG_ALG_END
     default:
       return NULL;
@@ -355,11 +292,6 @@ static int is_oqs_hybrid_alg(int openssl_nid)
     case NID_p256_falcon512:
     case NID_rsa3072_falcon512:
     case NID_p521_falcon1024:
-    case NID_p256_picnicl1full:
-    case NID_rsa3072_picnicl1full:
-    case NID_p256_picnic3l1:
-    case NID_rsa3072_picnic3l1:
-    case NID_p521_rainbowVclassic:
     case NID_p256_sphincsharaka128frobust:
     case NID_rsa3072_sphincsharaka128frobust:
     case NID_p256_sphincssha256128frobust:
@@ -382,17 +314,13 @@ static int get_classical_nid(int hybrid_id)
     case NID_rsa3072_dilithium2:
     case NID_rsa3072_dilithium2_aes:
     case NID_rsa3072_falcon512:
-    case NID_rsa3072_picnicl1full:
-    case NID_rsa3072_picnic3l1:
     case NID_rsa3072_sphincsharaka128frobust:
     case NID_rsa3072_sphincssha256128frobust:
     case NID_rsa3072_sphincsshake256128frobust:
       return NID_rsaEncryption;
     case NID_p256_dilithium2:
     case NID_p256_dilithium2_aes:
     case NID_p256_falcon512:
-    case NID_p256_picnicl1full:
-    case NID_p256_picnic3l1:
     case NID_p256_sphincsharaka128frobust:
     case NID_p256_sphincssha256128frobust:
     case NID_p256_sphincsshake256128frobust:
@@ -403,7 +331,6 @@ static int get_classical_nid(int hybrid_id)
     case NID_p521_dilithium5:
     case NID_p521_dilithium5_aes:
     case NID_p521_falcon1024:
-    case NID_p521_rainbowVclassic:
       return NID_secp521r1;///// OQS_TEMPLATE_FRAGMENT_ASSIGN_CLASSICAL_NIDS_END
     default:
       return 0;
@@ -434,14 +361,6 @@ static int get_oqs_nid(int hybrid_id)
       return NID_falcon512;
     case NID_p521_falcon1024:
       return NID_falcon1024;
-    case NID_p256_picnicl1full:
-    case NID_rsa3072_picnicl1full:
-      return NID_picnicl1full;
-    case NID_p256_picnic3l1:
-    case NID_rsa3072_picnic3l1:
-      return NID_picnic3l1;
-    case NID_p521_rainbowVclassic:
-      return NID_rainbowVclassic;
     case NID_p256_sphincsharaka128frobust:
     case NID_rsa3072_sphincsharaka128frobust:
       return NID_sphincsharaka128frobust;
@@ -595,17 +514,6 @@ static int get_oqs_security_bits(int openssl_nid)
     case NID_falcon1024:
     case NID_p521_falcon1024:
       return 256;
-    case NID_picnicl1full:
-    case NID_p256_picnicl1full:
-    case NID_rsa3072_picnicl1full:
-      return 128;
-    case NID_picnic3l1:
-    case NID_p256_picnic3l1:
-    case NID_rsa3072_picnic3l1:
-      return 128;
-    case NID_rainbowVclassic:
-    case NID_p521_rainbowVclassic:
-      return 256;
     case NID_sphincsharaka128frobust:
     case NID_p256_sphincsharaka128frobust:
     case NID_rsa3072_sphincsharaka128frobust:
@@ -1209,14 +1117,6 @@ static int oqs_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
         nid != NID_rsa3072_falcon512 &&
         nid != NID_falcon1024 &&
         nid != NID_p521_falcon1024 &&
-        nid != NID_picnicl1full &&
-        nid != NID_p256_picnicl1full &&
-        nid != NID_rsa3072_picnicl1full &&
-        nid != NID_picnic3l1 &&
-        nid != NID_p256_picnic3l1 &&
-        nid != NID_rsa3072_picnic3l1 &&
-        nid != NID_rainbowVclassic &&
-        nid != NID_p521_rainbowVclassic &&
         nid != NID_sphincsharaka128frobust &&
         nid != NID_p256_sphincsharaka128frobust &&
         nid != NID_rsa3072_sphincsharaka128frobust &&
@@ -1805,14 +1705,6 @@ DEFINE_OQS_EVP_METHODS(p256_falcon512, NID_p256_falcon512, "p256_falcon512", "Op
 DEFINE_OQS_EVP_METHODS(rsa3072_falcon512, NID_rsa3072_falcon512, "rsa3072_falcon512", "OpenSSL RSA3072 Falcon-512 algorithm")
 DEFINE_OQS_EVP_METHODS(falcon1024, NID_falcon1024, "falcon1024", "OpenSSL Falcon-1024 algorithm")
 DEFINE_OQS_EVP_METHODS(p521_falcon1024, NID_p521_falcon1024, "p521_falcon1024", "OpenSSL ECDSA p521 Falcon-1024 algorithm")
-DEFINE_OQS_EVP_METHODS(picnicl1full, NID_picnicl1full, "picnicl1full", "OpenSSL Picnic L1 full algorithm")
-DEFINE_OQS_EVP_METHODS(p256_picnicl1full, NID_p256_picnicl1full, "p256_picnicl1full", "OpenSSL ECDSA p256 Picnic L1 full algorithm")
-DEFINE_OQS_EVP_METHODS(rsa3072_picnicl1full, NID_rsa3072_picnicl1full, "rsa3072_picnicl1full", "OpenSSL RSA3072 Picnic L1 full algorithm")
-DEFINE_OQS_EVP_METHODS(picnic3l1, NID_picnic3l1, "picnic3l1", "OpenSSL Picnic3 L1 algorithm")
-DEFINE_OQS_EVP_METHODS(p256_picnic3l1, NID_p256_picnic3l1, "p256_picnic3l1", "OpenSSL ECDSA p256 Picnic3 L1 algorithm")
-DEFINE_OQS_EVP_METHODS(rsa3072_picnic3l1, NID_rsa3072_picnic3l1, "rsa3072_picnic3l1", "OpenSSL RSA3072 Picnic3 L1 algorithm")
-DEFINE_OQS_EVP_METHODS(rainbowVclassic, NID_rainbowVclassic, "rainbowVclassic", "OpenSSL Rainbow-V-Classic algorithm")
-DEFINE_OQS_EVP_METHODS(p521_rainbowVclassic, NID_p521_rainbowVclassic, "p521_rainbowVclassic", "OpenSSL ECDSA p521 Rainbow-V-Classic algorithm")
 DEFINE_OQS_EVP_METHODS(sphincsharaka128frobust, NID_sphincsharaka128frobust, "sphincsharaka128frobust", "OpenSSL SPHINCS+-Haraka-128f-robust algorithm")
 DEFINE_OQS_EVP_METHODS(p256_sphincsharaka128frobust, NID_p256_sphincsharaka128frobust, "p256_sphincsharaka128frobust", "OpenSSL ECDSA p256 SPHINCS+-Haraka-128f-robust algorithm")
 DEFINE_OQS_EVP_METHODS(rsa3072_sphincsharaka128frobust, NID_rsa3072_sphincsharaka128frobust, "rsa3072_sphincsharaka128frobust", "OpenSSL RSA3072 SPHINCS+-Haraka-128f-robust algorithm")

crypto/evp/pmeth_lib.c

@@ -88,14 +88,6 @@ static const EVP_PKEY_METHOD *standard_methods[] = {
     &rsa3072_falcon512_pkey_meth,
     &falcon1024_pkey_meth,
     &p521_falcon1024_pkey_meth,
-    &picnicl1full_pkey_meth,
-    &p256_picnicl1full_pkey_meth,
-    &rsa3072_picnicl1full_pkey_meth,
-    &picnic3l1_pkey_meth,
-    &p256_picnic3l1_pkey_meth,
-    &rsa3072_picnic3l1_pkey_meth,
-    &rainbowVclassic_pkey_meth,
-    &p521_rainbowVclassic_pkey_meth,
     &sphincsharaka128frobust_pkey_meth,
     &p256_sphincsharaka128frobust_pkey_meth,
     &rsa3072_sphincsharaka128frobust_pkey_meth,