toggle alg enablement in line with NIST decisions

README.md

@@ -84,9 +84,9 @@ Note that algorithms marked with a dagger (†) have large stack usage and may c
 The following digital signature algorithms from liboqs are supported (assuming they have been enabled in liboqs). Note that only select L3 signature variants are enabled by default. In general, algorithms that are enabled by default are marked with an asterisk, and should you wish to enable additional variants, consult [the "Code Generation" section of the documentation in the wiki](https://github.com/open-quantum-safe/openssh/wiki/Using-liboqs-supported-algorithms-in-the-fork#code-generation). Note that enabling Rainbow will introduce a substantial execution delay to all operations. If doing it inadvertently, tests will fail and all kind of headaches occur. You have been warned.
 
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_START -->
-- **Dilithium**: `dilithium2`, `dilithium3`\*, `dilithium5`, `dilithium2aes`\*, `dilithium3aes`, `dilithium5aes`\*
+- **Dilithium**: `dilithium2`\*, `dilithium3`\*, `dilithium5`\*, `dilithium2aes`, `dilithium3aes`, `dilithium5aes`
 - **Falcon**: `falcon512`\*, `falcon1024`\*
-- **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`
+- **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 -->
 
 

oqs-template/generate.yml

@@ -242,6 +242,7 @@ sigs:
   -
     family: 'Dilithium'
     name: 'dilithium_2'
+    enable: true
     level: 1
     mix_with:
       -
@@ -262,6 +263,7 @@ sigs:
   -
     family: 'Dilithium'
     name: 'dilithium_5'
+    enable: true
     level: 5
     mix_with:
       -
@@ -270,7 +272,6 @@ sigs:
   -
     family: 'Dilithium'
     name: 'dilithium_2_aes'
-    enable: true
     level: 1
     mix_with:
       -
@@ -290,7 +291,6 @@ sigs:
   -
     family: 'Dilithium'
     name: 'dilithium_5_aes'
-    enable: true
     level: 5
     mix_with:
       -
@@ -366,6 +366,7 @@ sigs:
   -
     family: 'SPHINCS'
     name: 'sphincs_sha256_128f_simple'
+    enable: true
     level: 1
     mix_with:
       -
@@ -432,7 +433,6 @@ sigs:
   -
     family: 'SPHINCS'
     name: 'sphincs_haraka_192f_robust'
-    enable: true
     level: 3
     mix_with:
       -
@@ -473,6 +473,7 @@ sigs:
   -
     family: 'SPHINCS'
     name: 'sphincs_sha256_192s_robust'
+    enable: true
     level: 3
     mix_with:
       -
@@ -577,6 +578,7 @@ sigs:
   -
     family: 'SPHINCS'
     name: 'sphincs_sha256_256f_simple'
+    enable: true
     level: 5
     mix_with:
       -

oqs-test/try_connection.py

@@ -76,18 +76,23 @@
     "ssh-ecdsa-nistp256-falcon512",
     "ssh-falcon1024",
     "ssh-ecdsa-nistp521-falcon1024",
+    "ssh-dilithium2",
+    "ssh-rsa3072-dilithium2",
+    "ssh-ecdsa-nistp256-dilithium2",
     "ssh-dilithium3",
     "ssh-ecdsa-nistp384-dilithium3",
-    "ssh-dilithium2aes",
-    "ssh-rsa3072-dilithium2aes",
-    "ssh-ecdsa-nistp256-dilithium2aes",
-    "ssh-dilithium5aes",
-    "ssh-ecdsa-nistp521-dilithium5aes",
+    "ssh-dilithium5",
+    "ssh-ecdsa-nistp521-dilithium5",
     "ssh-sphincsharaka128fsimple",
     "ssh-rsa3072-sphincsharaka128fsimple",
     "ssh-ecdsa-nistp256-sphincsharaka128fsimple",
-    "ssh-sphincsharaka192frobust",
-    "ssh-ecdsa-nistp384-sphincsharaka192frobust",
+    "ssh-sphincssha256128fsimple",
+    "ssh-rsa3072-sphincssha256128fsimple",
+    "ssh-ecdsa-nistp256-sphincssha256128fsimple",
+    "ssh-sphincssha256192srobust",
+    "ssh-ecdsa-nistp384-sphincssha256192srobust",
+    "ssh-sphincssha256256fsimple",
+    "ssh-ecdsa-nistp521-sphincssha256256fsimple",
 ##### OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_END
 ]
 

oqs-utils.c

@@ -5,10 +5,12 @@ int oqs_utils_is_rsa_hybrid(int keytype) {
 ///// OQS_TEMPLATE_FRAGMENT_LIST_RSA_HYBRIDS_START
         case KEY_RSA3072_FALCON_512:
             return 1;
-        case KEY_RSA3072_DILITHIUM_2_AES:
+        case KEY_RSA3072_DILITHIUM_2:
             return 1;
         case KEY_RSA3072_SPHINCS_HARAKA_128F_SIMPLE:
             return 1;
+        case KEY_RSA3072_SPHINCS_SHA256_128F_SIMPLE:
+            return 1;
 ///// OQS_TEMPLATE_FRAGMENT_LIST_RSA_HYBRIDS_END
     }
     return 0;
@@ -21,15 +23,19 @@ int oqs_utils_is_ecdsa_hybrid(int keytype) {
             return 1;
         case KEY_ECDSA_NISTP521_FALCON_1024:
             return 1;
-        case KEY_ECDSA_NISTP384_DILITHIUM_3:
+        case KEY_ECDSA_NISTP256_DILITHIUM_2:
             return 1;
-        case KEY_ECDSA_NISTP256_DILITHIUM_2_AES:
+        case KEY_ECDSA_NISTP384_DILITHIUM_3:
             return 1;
-        case KEY_ECDSA_NISTP521_DILITHIUM_5_AES:
+        case KEY_ECDSA_NISTP521_DILITHIUM_5:
             return 1;
         case KEY_ECDSA_NISTP256_SPHINCS_HARAKA_128F_SIMPLE:
             return 1;
-        case KEY_ECDSA_NISTP384_SPHINCS_HARAKA_192F_ROBUST:
+        case KEY_ECDSA_NISTP256_SPHINCS_SHA256_128F_SIMPLE:
+            return 1;
+        case KEY_ECDSA_NISTP384_SPHINCS_SHA256_192S_ROBUST:
+            return 1;
+        case KEY_ECDSA_NISTP521_SPHINCS_SHA256_256F_SIMPLE:
             return 1;
 ///// OQS_TEMPLATE_FRAGMENT_LIST_ECDSA_HYBRIDS_END
     }

oqs-utils.h

@@ -9,25 +9,30 @@
 #define CASE_KEY_OQS \
 	case KEY_FALCON_512: \
 	case KEY_FALCON_1024: \
+	case KEY_DILITHIUM_2: \
 	case KEY_DILITHIUM_3: \
-	case KEY_DILITHIUM_2_AES: \
-	case KEY_DILITHIUM_5_AES: \
+	case KEY_DILITHIUM_5: \
 	case KEY_SPHINCS_HARAKA_128F_SIMPLE: \
-	case KEY_SPHINCS_HARAKA_192F_ROBUST
+	case KEY_SPHINCS_SHA256_128F_SIMPLE: \
+	case KEY_SPHINCS_SHA256_192S_ROBUST: \
+	case KEY_SPHINCS_SHA256_256F_SIMPLE
 
 #define CASE_KEY_RSA_HYBRID \
 	case KEY_RSA3072_FALCON_512: \
-	case KEY_RSA3072_DILITHIUM_2_AES: \
-	case KEY_RSA3072_SPHINCS_HARAKA_128F_SIMPLE
+	case KEY_RSA3072_DILITHIUM_2: \
+	case KEY_RSA3072_SPHINCS_HARAKA_128F_SIMPLE: \
+	case KEY_RSA3072_SPHINCS_SHA256_128F_SIMPLE
 
 #define CASE_KEY_ECDSA_HYBRID \
 	case KEY_ECDSA_NISTP256_FALCON_512: \
 	case KEY_ECDSA_NISTP521_FALCON_1024: \
+	case KEY_ECDSA_NISTP256_DILITHIUM_2: \
 	case KEY_ECDSA_NISTP384_DILITHIUM_3: \
-	case KEY_ECDSA_NISTP256_DILITHIUM_2_AES: \
-	case KEY_ECDSA_NISTP521_DILITHIUM_5_AES: \
+	case KEY_ECDSA_NISTP521_DILITHIUM_5: \
 	case KEY_ECDSA_NISTP256_SPHINCS_HARAKA_128F_SIMPLE: \
-	case KEY_ECDSA_NISTP384_SPHINCS_HARAKA_192F_ROBUST
+	case KEY_ECDSA_NISTP256_SPHINCS_SHA256_128F_SIMPLE: \
+	case KEY_ECDSA_NISTP384_SPHINCS_SHA256_192S_ROBUST: \
+	case KEY_ECDSA_NISTP521_SPHINCS_SHA256_256F_SIMPLE
 ///// OQS_TEMPLATE_FRAGMENT_DEFINE_KEY_CASE_MACROS_END
 
 #define CASE_KEY_HYBRID \

pathnames.h

@@ -47,18 +47,23 @@
 #define _PATH_HOST_ECDSA_NISTP256_FALCON_512_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_falcon512_key"
 #define _PATH_HOST_FALCON_1024_KEY_FILE SSHDIR "/ssh_host_falcon1024_key"
 #define _PATH_HOST_ECDSA_NISTP521_FALCON_1024_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_falcon1024_key"
+#define _PATH_HOST_DILITHIUM_2_KEY_FILE SSHDIR "/ssh_host_dilithium2_key"
+#define _PATH_HOST_RSA3072_DILITHIUM_2_KEY_FILE SSHDIR "/ssh_host_rsa3072_dilithium2_key"
+#define _PATH_HOST_ECDSA_NISTP256_DILITHIUM_2_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_dilithium2_key"
 #define _PATH_HOST_DILITHIUM_3_KEY_FILE SSHDIR "/ssh_host_dilithium3_key"
 #define _PATH_HOST_ECDSA_NISTP384_DILITHIUM_3_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_dilithium3_key"
-#define _PATH_HOST_DILITHIUM_2_AES_KEY_FILE SSHDIR "/ssh_host_dilithium2aes_key"
-#define _PATH_HOST_RSA3072_DILITHIUM_2_AES_KEY_FILE SSHDIR "/ssh_host_rsa3072_dilithium2aes_key"
-#define _PATH_HOST_ECDSA_NISTP256_DILITHIUM_2_AES_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_dilithium2aes_key"
-#define _PATH_HOST_DILITHIUM_5_AES_KEY_FILE SSHDIR "/ssh_host_dilithium5aes_key"
-#define _PATH_HOST_ECDSA_NISTP521_DILITHIUM_5_AES_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_dilithium5aes_key"
+#define _PATH_HOST_DILITHIUM_5_KEY_FILE SSHDIR "/ssh_host_dilithium5_key"
+#define _PATH_HOST_ECDSA_NISTP521_DILITHIUM_5_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_dilithium5_key"
 #define _PATH_HOST_SPHINCS_HARAKA_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_sphincsharaka128fsimple_key"
 #define _PATH_HOST_RSA3072_SPHINCS_HARAKA_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_rsa3072_sphincsharaka128fsimple_key"
 #define _PATH_HOST_ECDSA_NISTP256_SPHINCS_HARAKA_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_sphincsharaka128fsimple_key"
-#define _PATH_HOST_SPHINCS_HARAKA_192F_ROBUST_KEY_FILE SSHDIR "/ssh_host_sphincsharaka192frobust_key"
-#define _PATH_HOST_ECDSA_NISTP384_SPHINCS_HARAKA_192F_ROBUST_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_sphincsharaka192frobust_key"
+#define _PATH_HOST_SPHINCS_SHA256_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_sphincssha256128fsimple_key"
+#define _PATH_HOST_RSA3072_SPHINCS_SHA256_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_rsa3072_sphincssha256128fsimple_key"
+#define _PATH_HOST_ECDSA_NISTP256_SPHINCS_SHA256_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_sphincssha256128fsimple_key"
+#define _PATH_HOST_SPHINCS_SHA256_192S_ROBUST_KEY_FILE SSHDIR "/ssh_host_sphincssha256192srobust_key"
+#define _PATH_HOST_ECDSA_NISTP384_SPHINCS_SHA256_192S_ROBUST_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_sphincssha256192srobust_key"
+#define _PATH_HOST_SPHINCS_SHA256_256F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_sphincssha256256fsimple_key"
+#define _PATH_HOST_ECDSA_NISTP521_SPHINCS_SHA256_256F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_sphincssha256256fsimple_key"
 ///// OQS_TEMPLATE_FRAGMENT_ADD_KEY_FILE_PATHS_END
 #define _PATH_DH_MODULI			SSHDIR "/moduli"
 
@@ -104,18 +109,23 @@
 #define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_FALCON_512 _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_falcon512"
 #define _PATH_SSH_CLIENT_ID_FALCON_1024 _PATH_SSH_USER_DIR "/id_falcon1024"
 #define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_FALCON_1024 _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_falcon1024"
+#define _PATH_SSH_CLIENT_ID_DILITHIUM_2 _PATH_SSH_USER_DIR "/id_dilithium2"
+#define _PATH_SSH_CLIENT_ID_RSA3072_DILITHIUM_2 _PATH_SSH_USER_DIR "/id_rsa3072_dilithium2"
+#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_DILITHIUM_2 _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_dilithium2"
 #define _PATH_SSH_CLIENT_ID_DILITHIUM_3 _PATH_SSH_USER_DIR "/id_dilithium3"
 #define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_DILITHIUM_3 _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_dilithium3"
-#define _PATH_SSH_CLIENT_ID_DILITHIUM_2_AES _PATH_SSH_USER_DIR "/id_dilithium2aes"
-#define _PATH_SSH_CLIENT_ID_RSA3072_DILITHIUM_2_AES _PATH_SSH_USER_DIR "/id_rsa3072_dilithium2aes"
-#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_DILITHIUM_2_AES _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_dilithium2aes"
-#define _PATH_SSH_CLIENT_ID_DILITHIUM_5_AES _PATH_SSH_USER_DIR "/id_dilithium5aes"
-#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_DILITHIUM_5_AES _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_dilithium5aes"
+#define _PATH_SSH_CLIENT_ID_DILITHIUM_5 _PATH_SSH_USER_DIR "/id_dilithium5"
+#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_DILITHIUM_5 _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_dilithium5"
 #define _PATH_SSH_CLIENT_ID_SPHINCS_HARAKA_128F_SIMPLE _PATH_SSH_USER_DIR "/id_sphincsharaka128fsimple"
 #define _PATH_SSH_CLIENT_ID_RSA3072_SPHINCS_HARAKA_128F_SIMPLE _PATH_SSH_USER_DIR "/id_rsa3072_sphincsharaka128fsimple"
 #define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SPHINCS_HARAKA_128F_SIMPLE _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_sphincsharaka128fsimple"
-#define _PATH_SSH_CLIENT_ID_SPHINCS_HARAKA_192F_ROBUST _PATH_SSH_USER_DIR "/id_sphincsharaka192frobust"
-#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_SPHINCS_HARAKA_192F_ROBUST _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_sphincsharaka192frobust"
+#define _PATH_SSH_CLIENT_ID_SPHINCS_SHA256_128F_SIMPLE _PATH_SSH_USER_DIR "/id_sphincssha256128fsimple"
+#define _PATH_SSH_CLIENT_ID_RSA3072_SPHINCS_SHA256_128F_SIMPLE _PATH_SSH_USER_DIR "/id_rsa3072_sphincssha256128fsimple"
+#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SPHINCS_SHA256_128F_SIMPLE _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_sphincssha256128fsimple"
+#define _PATH_SSH_CLIENT_ID_SPHINCS_SHA256_192S_ROBUST _PATH_SSH_USER_DIR "/id_sphincssha256192srobust"
+#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_SPHINCS_SHA256_192S_ROBUST _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_sphincssha256192srobust"
+#define _PATH_SSH_CLIENT_ID_SPHINCS_SHA256_256F_SIMPLE _PATH_SSH_USER_DIR "/id_sphincssha256256fsimple"
+#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SPHINCS_SHA256_256F_SIMPLE _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_sphincssha256256fsimple"
 ///// OQS_TEMPLATE_FRAGMENT_ADD_ID_FILE_PATHS_END
 
 /*

readconf.c

@@ -2546,23 +2546,28 @@ fill_default_options(Options * options)
 ///// OQS_TEMPLATE_FRAGMENT_ADD_ID_FILES_START
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_FALCON_512, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_FALCON_1024, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DILITHIUM_2, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DILITHIUM_3, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DILITHIUM_2_AES, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DILITHIUM_5_AES, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DILITHIUM_5, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SPHINCS_HARAKA_128F_SIMPLE, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SPHINCS_HARAKA_192F_ROBUST, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SPHINCS_SHA256_128F_SIMPLE, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SPHINCS_SHA256_192S_ROBUST, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SPHINCS_SHA256_256F_SIMPLE, 0);
 #ifdef WITH_OPENSSL
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_FALCON_512, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_DILITHIUM_2_AES, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_DILITHIUM_2, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_SPHINCS_HARAKA_128F_SIMPLE, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_SPHINCS_SHA256_128F_SIMPLE, 0);
 #ifdef OPENSSL_HAS_ECC
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_FALCON_512, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_FALCON_1024, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_DILITHIUM_2, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_DILITHIUM_3, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_DILITHIUM_2_AES, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_DILITHIUM_5_AES, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_DILITHIUM_5, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SPHINCS_HARAKA_128F_SIMPLE, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_SPHINCS_HARAKA_192F_ROBUST, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SPHINCS_SHA256_128F_SIMPLE, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_SPHINCS_SHA256_192S_ROBUST, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SPHINCS_SHA256_256F_SIMPLE, 0);
 #endif /* OPENSSL_HAS_ECC */
 #endif /* WITH_OPENSSL */
 ///// OQS_TEMPLATE_FRAGMENT_ADD_ID_FILES_END

regress/keygen-comment.sh

@@ -33,11 +33,13 @@ for fmt in '' RFC4716 PKCS8 PEM; do
 ##### OQS_TEMPLATE_FRAGMENT_EXCLUDE_OQS_ALGS_START
 		*falcon512*) test -z "$oldfmt" || continue ;;
 		*falcon1024*) test -z "$oldfmt" || continue ;;
+		*dilithium2*) test -z "$oldfmt" || continue ;;
 		*dilithium3*) test -z "$oldfmt" || continue ;;
-		*dilithium2aes*) test -z "$oldfmt" || continue ;;
-		*dilithium5aes*) test -z "$oldfmt" || continue ;;
+		*dilithium5*) test -z "$oldfmt" || continue ;;
 		*sphincsharaka128fsimple*) test -z "$oldfmt" || continue ;;
-		*sphincsharaka192frobust*) test -z "$oldfmt" || continue ;;
+		*sphincssha256128fsimple*) test -z "$oldfmt" || continue ;;
+		*sphincssha256192srobust*) test -z "$oldfmt" || continue ;;
+		*sphincssha256256fsimple*) test -z "$oldfmt" || continue ;;
 ##### OQS_TEMPLATE_FRAGMENT_EXCLUDE_OQS_ALGS_END
 		esac
 		comment="foo bar"