Updating Sphincs to SLH-DSA

README.md

@@ -101,7 +101,7 @@ The following digital signature algorithms from liboqs are supported (assuming t
 - **Falcon**: `falcon512`\*, `falcon1024`\*, `falconpadded512`, `falconpadded1024`
 - **MAYO**: `mayo1`, `mayo2`\*, `mayo3`\*, `mayo5`\*
 - **ML-DSA**: `mldsa44`\*, `mldsa65`\*, `mldsa87`\*
-- **SPHINCS**: `sphincssha2128fsimple`\*, `sphincssha2128ssimple`, `sphincsshake128fsimple`, `sphincsshake128ssimple`, `sphincssha2192fsimple`, `sphincssha2192ssimple`, `sphincsshake192fsimple`, `sphincsshake192ssimple`, `sphincssha2256fsimple`\*, `sphincssha2256ssimple`, `sphincsshake256fsimple`, `sphincsshake256ssimple`
+- **SLH-DSA**: `slhdsapuresha2128f`\*, `slhdsasha2128ssimple`, `slhdsashake128fsimple`, `slhdsashake128ssimple`, `slhdsasha2192fsimple`, `slhdsasha2192ssimple`, `slhdsashake192fsimple`, `slhdsashake192ssimple`, `slhdsapuresha2256f`\*, `slhdsasha2256ssimple`, `slhdsashake256fsimple`, `slhdsashake256ssimple`
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_END -->
 
 

oqs-template/generate.yml

@@ -425,8 +425,8 @@ sigs:
         name: 'ecdsa_nistp521'
         openssl_nid: 'NID_secp521r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_sha2_128f_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_pure_sha2_128f'
     enable: true
     level: 1
     mix_with:
@@ -437,8 +437,8 @@ sigs:
         name: 'ecdsa_nistp256'
         openssl_nid: 'NID_X9_62_prime256v1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_sha2_128s_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_sha2_128s_simple'
     level: 1
     mix_with:
       -
@@ -448,8 +448,8 @@ sigs:
         name: 'ecdsa_nistp256'
         openssl_nid: 'NID_X9_62_prime256v1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_shake_128f_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_shake_128f_simple'
     level: 1
     mix_with:
       -
@@ -459,8 +459,8 @@ sigs:
         name: 'ecdsa_nistp256'
         openssl_nid: 'NID_X9_62_prime256v1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_shake_128s_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_shake_128s_simple'
     level: 1
     mix_with:
       -
@@ -470,65 +470,65 @@ sigs:
         name: 'ecdsa_nistp256'
         openssl_nid: 'NID_X9_62_prime256v1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_sha2_192f_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_sha2_192f_simple'
     level: 3
     mix_with:
       -
         name: 'ecdsa_nistp384'
         openssl_nid: 'NID_secp384r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_sha2_192s_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_sha2_192s_simple'
     level: 3
     mix_with:
       -
         name: 'ecdsa_nistp384'
         openssl_nid: 'NID_secp384r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_shake_192f_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_shake_192f_simple'
     level: 3
     mix_with:
       -
         name: 'ecdsa_nistp384'
         openssl_nid: 'NID_secp384r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_shake_192s_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_shake_192s_simple'
     level: 3
     mix_with:
       -
         name: 'ecdsa_nistp384'
         openssl_nid: 'NID_secp384r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_sha2_256f_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_pure_sha2_256f'
     enable: true
     level: 5
     mix_with:
       -
         name: 'ecdsa_nistp521'
         openssl_nid: 'NID_secp521r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_sha2_256s_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_sha2_256s_simple'
     level: 5
     mix_with:
       -
         name: 'ecdsa_nistp521'
         openssl_nid: 'NID_secp521r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_shake_256f_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_shake_256f_simple'
     level: 5
     mix_with:
       -
         name: 'ecdsa_nistp521'
         openssl_nid: 'NID_secp521r1'
   -
-    family: 'SPHINCS'
-    name: 'sphincs_shake_256s_simple'
+    family: 'SLH-DSA'
+    name: 'slh_dsa_shake_256s_simple'
     level: 5
     mix_with:
       -

oqs-test/try_connection.py

@@ -83,11 +83,11 @@
     "ssh-ecdsa-nistp256-falcon512",
     "ssh-falcon1024",
     "ssh-ecdsa-nistp521-falcon1024",
-    "ssh-sphincssha2128fsimple",
-    "ssh-rsa3072-sphincssha2128fsimple",
-    "ssh-ecdsa-nistp256-sphincssha2128fsimple",
-    "ssh-sphincssha2256fsimple",
-    "ssh-ecdsa-nistp521-sphincssha2256fsimple",
+    "ssh-slhdsapuresha2128f",
+    "ssh-rsa3072-slhdsapuresha2128f",
+    "ssh-ecdsa-nistp256-slhdsapuresha2128f",
+    "ssh-slhdsapuresha2256f",
+    "ssh-ecdsa-nistp521-slhdsapuresha2256f",
     "ssh-mldsa-44",
     "ssh-rsa3072-mldsa-44",
     "ssh-ecdsa-nistp256-mldsa-44",

oqs-utils.c

@@ -5,7 +5,7 @@ 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_SPHINCS_SHA2_128F_SIMPLE:
+        case KEY_RSA3072_SLH_DSA_PURE_SHA2_128F:
             return 1;
         case KEY_RSA3072_ML_DSA_44:
             return 1;
@@ -23,9 +23,9 @@ int oqs_utils_is_ecdsa_hybrid(int keytype) {
             return 1;
         case KEY_ECDSA_NISTP521_FALCON_1024:
             return 1;
-        case KEY_ECDSA_NISTP256_SPHINCS_SHA2_128F_SIMPLE:
+        case KEY_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F:
             return 1;
-        case KEY_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE:
+        case KEY_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F:
             return 1;
         case KEY_ECDSA_NISTP256_ML_DSA_44:
             return 1;

oqs-utils.h

@@ -9,8 +9,8 @@
 #define CASE_KEY_OQS \
 	case KEY_FALCON_512: \
 	case KEY_FALCON_1024: \
-	case KEY_SPHINCS_SHA2_128F_SIMPLE: \
-	case KEY_SPHINCS_SHA2_256F_SIMPLE: \
+	case KEY_SLH_DSA_PURE_SHA2_128F: \
+	case KEY_SLH_DSA_PURE_SHA2_256F: \
 	case KEY_ML_DSA_44: \
 	case KEY_ML_DSA_65: \
 	case KEY_ML_DSA_87: \
@@ -20,15 +20,15 @@
 
 #define CASE_KEY_RSA_HYBRID \
 	case KEY_RSA3072_FALCON_512: \
-	case KEY_RSA3072_SPHINCS_SHA2_128F_SIMPLE: \
+	case KEY_RSA3072_SLH_DSA_PURE_SHA2_128F: \
 	case KEY_RSA3072_ML_DSA_44: \
 	case KEY_RSA3072_MAYO_2
 
 #define CASE_KEY_ECDSA_HYBRID \
 	case KEY_ECDSA_NISTP256_FALCON_512: \
 	case KEY_ECDSA_NISTP521_FALCON_1024: \
-	case KEY_ECDSA_NISTP256_SPHINCS_SHA2_128F_SIMPLE: \
-	case KEY_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE: \
+	case KEY_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F: \
+	case KEY_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F: \
 	case KEY_ECDSA_NISTP256_ML_DSA_44: \
 	case KEY_ECDSA_NISTP384_ML_DSA_65: \
 	case KEY_ECDSA_NISTP521_ML_DSA_87: \

pathnames.h

@@ -45,11 +45,11 @@
 #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_SPHINCS_SHA2_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_sphincssha2128fsimple_key"
-#define _PATH_HOST_RSA3072_SPHINCS_SHA2_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_rsa3072_sphincssha2128fsimple_key"
-#define _PATH_HOST_ECDSA_NISTP256_SPHINCS_SHA2_128F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_sphincssha2128fsimple_key"
-#define _PATH_HOST_SPHINCS_SHA2_256F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_sphincssha2256fsimple_key"
-#define _PATH_HOST_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_sphincssha2256fsimple_key"
+#define _PATH_HOST_SLH_DSA_PURE_SHA2_128F_KEY_FILE SSHDIR "/ssh_host_slhdsapuresha2128f_key"
+#define _PATH_HOST_RSA3072_SLH_DSA_PURE_SHA2_128F_KEY_FILE SSHDIR "/ssh_host_rsa3072_slhdsapuresha2128f_key"
+#define _PATH_HOST_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_slhdsapuresha2128f_key"
+#define _PATH_HOST_SLH_DSA_PURE_SHA2_256F_KEY_FILE SSHDIR "/ssh_host_slhdsapuresha2256f_key"
+#define _PATH_HOST_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_slhdsapuresha2256f_key"
 #define _PATH_HOST_ML_DSA_44_KEY_FILE SSHDIR "/ssh_host_mldsa44_key"
 #define _PATH_HOST_RSA3072_ML_DSA_44_KEY_FILE SSHDIR "/ssh_host_rsa3072_mldsa44_key"
 #define _PATH_HOST_ECDSA_NISTP256_ML_DSA_44_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp256_mldsa44_key"
@@ -122,11 +122,11 @@
 #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_SPHINCS_SHA2_128F_SIMPLE _PATH_SSH_USER_DIR "/id_sphincssha2128fsimple"
-#define _PATH_SSH_CLIENT_ID_RSA3072_SPHINCS_SHA2_128F_SIMPLE _PATH_SSH_USER_DIR "/id_rsa3072_sphincssha2128fsimple"
-#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SPHINCS_SHA2_128F_SIMPLE _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_sphincssha2128fsimple"
-#define _PATH_SSH_CLIENT_ID_SPHINCS_SHA2_256F_SIMPLE _PATH_SSH_USER_DIR "/id_sphincssha2256fsimple"
-#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_sphincssha2256fsimple"
+#define _PATH_SSH_CLIENT_ID_SLH_DSA_PURE_SHA2_128F _PATH_SSH_USER_DIR "/id_slhdsapuresha2128f"
+#define _PATH_SSH_CLIENT_ID_RSA3072_SLH_DSA_PURE_SHA2_128F _PATH_SSH_USER_DIR "/id_rsa3072_slhdsapuresha2128f"
+#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_slhdsapuresha2128f"
+#define _PATH_SSH_CLIENT_ID_SLH_DSA_PURE_SHA2_256F _PATH_SSH_USER_DIR "/id_slhdsapuresha2256f"
+#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_slhdsapuresha2256f"
 #define _PATH_SSH_CLIENT_ID_ML_DSA_44 _PATH_SSH_USER_DIR "/id_mldsa44"
 #define _PATH_SSH_CLIENT_ID_RSA3072_ML_DSA_44 _PATH_SSH_USER_DIR "/id_rsa3072_mldsa44"
 #define _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_ML_DSA_44 _PATH_SSH_USER_DIR "/id_ecdsa_nistp256_mldsa44"

readconf.c

@@ -2908,8 +2908,8 @@ 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_SPHINCS_SHA2_128F_SIMPLE, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SPHINCS_SHA2_256F_SIMPLE, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SLH_DSA_PURE_SHA2_128F, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_SLH_DSA_PURE_SHA2_256F, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ML_DSA_44, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ML_DSA_65, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ML_DSA_87, 0);
@@ -2918,14 +2918,14 @@ fill_default_options(Options * options)
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_MAYO_5, 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_SPHINCS_SHA2_128F_SIMPLE, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_SLH_DSA_PURE_SHA2_128F, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_ML_DSA_44, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_MAYO_2, 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_SPHINCS_SHA2_128F_SIMPLE, 0);
-		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F, 0);
+		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_ML_DSA_44, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_ML_DSA_65, 0);
 		add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_ML_DSA_87, 0);

regress/Makefile

@@ -152,7 +152,7 @@ CLEANFILES=	*.core actual agent-key.* authorized_keys_${USERNAME} \
 		t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub \
 		t8.out t8.out.pub t9.out t9.out.pub \
 		timestamp testdata user_*key* user_ca* user_key* \
-		*dilith* *falco* *picni* *sphincs* \
+		*dilith* *falco* *picni* *sphincs* *slh-dsa* *slhdsa* \
 		ecdsa-sha2-nistp* sk-* ssh-dss* ssh-rsa* ssh-ed25519* \
 		host.sk-* copy authkeys_orig sshd_config_minimal check-perm mkdtemp
 

regress/keygen-comment.sh

@@ -34,8 +34,8 @@ for fmt in '' RFC4716 PKCS8 PEM; do
 ##### OQS_TEMPLATE_FRAGMENT_EXCLUDE_OQS_ALGS_START
 		*falcon512*) test -z "$oldfmt" || continue ;;
 		*falcon1024*) test -z "$oldfmt" || continue ;;
-		*sphincssha2128fsimple*) test -z "$oldfmt" || continue ;;
-		*sphincssha2256fsimple*) test -z "$oldfmt" || continue ;;
+		*slhdsapuresha2128f*) test -z "$oldfmt" || continue ;;
+		*slhdsapuresha2256f*) test -z "$oldfmt" || continue ;;
 		*mldsa-44*) test -z "$oldfmt" || continue ;;
 		*mldsa-65*) test -z "$oldfmt" || continue ;;
 		*mldsa-87*) test -z "$oldfmt" || continue ;;

servconf.c

@@ -318,9 +318,9 @@ fill_default_server_options(ServerOptions *options)
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_FALCON_1024_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
-		    _PATH_HOST_SPHINCS_SHA2_128F_SIMPLE_KEY_FILE, 0);
+		    _PATH_HOST_SLH_DSA_PURE_SHA2_128F_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
-		    _PATH_HOST_SPHINCS_SHA2_256F_SIMPLE_KEY_FILE, 0);
+		    _PATH_HOST_SLH_DSA_PURE_SHA2_256F_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_ML_DSA_44_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
@@ -337,7 +337,7 @@ fill_default_server_options(ServerOptions *options)
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_RSA3072_FALCON_512_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
-		    _PATH_HOST_RSA3072_SPHINCS_SHA2_128F_SIMPLE_KEY_FILE, 0);
+		    _PATH_HOST_RSA3072_SLH_DSA_PURE_SHA2_128F_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_RSA3072_ML_DSA_44_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
@@ -348,9 +348,9 @@ fill_default_server_options(ServerOptions *options)
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_ECDSA_NISTP521_FALCON_1024_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
-		    _PATH_HOST_ECDSA_NISTP256_SPHINCS_SHA2_128F_SIMPLE_KEY_FILE, 0);
+		    _PATH_HOST_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
-		    _PATH_HOST_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE_KEY_FILE, 0);
+		    _PATH_HOST_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_ECDSA_NISTP256_ML_DSA_44_KEY_FILE, 0);
 		servconf_add_hostkey("[default]", 0, options,

sk-api.h

@@ -36,11 +36,11 @@
 #define SSH_SK_ECDSA_NISTP256_FALCON_512 0x04
 #define SSH_SK_FALCON_1024 0x05
 #define SSH_SK_ECDSA_NISTP521_FALCON_1024 0x06
-#define SSH_SK_SPHINCS_SHA2_128F_SIMPLE 0x07
-#define SSH_SK_RSA3072_SPHINCS_SHA2_128F_SIMPLE 0x08
-#define SSH_SK_ECDSA_NISTP256_SPHINCS_SHA2_128F_SIMPLE 0x09
-#define SSH_SK_SPHINCS_SHA2_256F_SIMPLE 0x0A
-#define SSH_SK_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE 0x0B
+#define SSH_SK_SLH_DSA_PURE_SHA2_128F 0x07
+#define SSH_SK_RSA3072_SLH_DSA_PURE_SHA2_128F 0x08
+#define SSH_SK_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F 0x09
+#define SSH_SK_SLH_DSA_PURE_SHA2_256F 0x0A
+#define SSH_SK_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F 0x0B
 #define SSH_SK_ML_DSA_44 0x0C
 #define SSH_SK_RSA3072_ML_DSA_44 0x0D
 #define SSH_SK_ECDSA_NISTP256_ML_DSA_44 0x0E

ssh-add.c

@@ -90,8 +90,8 @@ static char *default_files[] = {
 ///// OQS_TEMPLATE_FRAGMENT_ADD_DEFAULT_ID_FILES_START
 	_PATH_SSH_CLIENT_ID_FALCON_512,
 	_PATH_SSH_CLIENT_ID_FALCON_1024,
-	_PATH_SSH_CLIENT_ID_SPHINCS_SHA2_128F_SIMPLE,
-	_PATH_SSH_CLIENT_ID_SPHINCS_SHA2_256F_SIMPLE,
+	_PATH_SSH_CLIENT_ID_SLH_DSA_PURE_SHA2_128F,
+	_PATH_SSH_CLIENT_ID_SLH_DSA_PURE_SHA2_256F,
 	_PATH_SSH_CLIENT_ID_ML_DSA_44,
 	_PATH_SSH_CLIENT_ID_ML_DSA_65,
 	_PATH_SSH_CLIENT_ID_ML_DSA_87,
@@ -100,14 +100,14 @@ static char *default_files[] = {
 	_PATH_SSH_CLIENT_ID_MAYO_5,
 #ifdef WITH_OPENSSL
 	_PATH_SSH_CLIENT_ID_RSA3072_FALCON_512,
-	_PATH_SSH_CLIENT_ID_RSA3072_SPHINCS_SHA2_128F_SIMPLE,
+	_PATH_SSH_CLIENT_ID_RSA3072_SLH_DSA_PURE_SHA2_128F,
 	_PATH_SSH_CLIENT_ID_RSA3072_ML_DSA_44,
 	_PATH_SSH_CLIENT_ID_RSA3072_MAYO_2,
 #ifdef OPENSSL_HAS_ECC
 	_PATH_SSH_CLIENT_ID_ECDSA_NISTP256_FALCON_512,
 	_PATH_SSH_CLIENT_ID_ECDSA_NISTP521_FALCON_1024,
-	_PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SPHINCS_SHA2_128F_SIMPLE,
-	_PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SPHINCS_SHA2_256F_SIMPLE,
+	_PATH_SSH_CLIENT_ID_ECDSA_NISTP256_SLH_DSA_PURE_SHA2_128F,
+	_PATH_SSH_CLIENT_ID_ECDSA_NISTP521_SLH_DSA_PURE_SHA2_256F,
 	_PATH_SSH_CLIENT_ID_ECDSA_NISTP256_ML_DSA_44,
 	_PATH_SSH_CLIENT_ID_ECDSA_NISTP384_ML_DSA_65,
 	_PATH_SSH_CLIENT_ID_ECDSA_NISTP521_ML_DSA_87,