Skip to content

Commit 648cbaf

Browse files
SWilson4SWilson4
committed
Run oqs-template/generate.py
1 parent ee99728 commit 648cbaf

17 files changed

+3324
-100
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,13 @@ Algorithms which involve ML-KEM are provided using the names as proposed in [dra
9191
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).
9292

9393
<!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_START -->
94+
- **CROSS**: `crossrsdp128balanced`, `crossrsdp128fast`, `crossrsdp128small`, `crossrsdp192balanced`\*, `crossrsdp192fast`\*, `crossrsdp192small`\*, `crossrsdp256balanced`\*, `crossrsdp256fast`\*, `crossrsdp256small`\*, `crossrsdpg128balanced`, `crossrsdpg128fast`, `crossrsdpg128small`, `crossrsdpg192balanced`\*, `crossrsdpg192fast`\*, `crossrsdpg192small`\*, `crossrsdpg256balanced`\*, `crossrsdpg256fast`\*, `crossrsdpg256small`\*
9495
- **Dilithium**: `dilithium2`, `dilithium3`, `dilithium5`
9596
- **Falcon**: `falcon512`\*, `falcon1024`\*, `falconpadded512`, `falconpadded1024`
9697
- **MAYO**: `mayo1`, `mayo2`\*, `mayo3`\*, `mayo5`\*
9798
- **ML-DSA**: `mldsa44`\*, `mldsa65`\*, `mldsa87`\*
9899
- **SPHINCS**: `sphincssha2128fsimple`\*, `sphincssha2128ssimple`, `sphincsshake128fsimple`, `sphincsshake128ssimple`, `sphincssha2192fsimple`, `sphincssha2192ssimple`, `sphincsshake192fsimple`, `sphincsshake192ssimple`, `sphincssha2256fsimple`\*, `sphincssha2256ssimple`, `sphincsshake256fsimple`, `sphincsshake256ssimple`
100+
- **UOV**: `ovis`, `ovip`, `oviii`\*, `ovv`\*, `ovispkc`, `ovippkc`, `oviiipkc`\*, `ovvpkc`\*, `ovispkcskc`, `ovippkcskc`, `oviiipkcskc`\*, `ovvpkcskc`\*
99101
<!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_END -->
100102

101103

‎oqs-test/try_connection.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,42 @@
102102
"ssh-ecdsa-nistp384-mayo3",
103103
"ssh-mayo5",
104104
"ssh-ecdsa-nistp521-mayo5",
105+
"ssh-crossrsdp192balanced",
106+
"ssh-ecdsa-nistp384-crossrsdp192balanced",
107+
"ssh-crossrsdp192fast",
108+
"ssh-ecdsa-nistp384-crossrsdp192fast",
109+
"ssh-crossrsdp192small",
110+
"ssh-ecdsa-nistp384-crossrsdp192small",
111+
"ssh-crossrsdp256balanced",
112+
"ssh-ecdsa-nistp521-crossrsdp256balanced",
113+
"ssh-crossrsdp256fast",
114+
"ssh-ecdsa-nistp521-crossrsdp256fast",
115+
"ssh-crossrsdp256small",
116+
"ssh-ecdsa-nistp521-crossrsdp256small",
117+
"ssh-crossrsdpg192balanced",
118+
"ssh-ecdsa-nistp384-crossrsdpg192balanced",
119+
"ssh-crossrsdpg192fast",
120+
"ssh-ecdsa-nistp384-crossrsdpg192fast",
121+
"ssh-crossrsdpg192small",
122+
"ssh-ecdsa-nistp384-crossrsdpg192small",
123+
"ssh-crossrsdpg256balanced",
124+
"ssh-ecdsa-nistp521-crossrsdpg256balanced",
125+
"ssh-crossrsdpg256fast",
126+
"ssh-ecdsa-nistp521-crossrsdpg256fast",
127+
"ssh-crossrsdpg256small",
128+
"ssh-ecdsa-nistp521-crossrsdpg256small",
129+
"ssh-oviii",
130+
"ssh-ecdsa-nistp384-oviii",
131+
"ssh-ovv",
132+
"ssh-ecdsa-nistp521-ovv",
133+
"ssh-oviiipkc",
134+
"ssh-ecdsa-nistp384-oviiipkc",
135+
"ssh-ovvpkc",
136+
"ssh-ecdsa-nistp521-ovvpkc",
137+
"ssh-oviiipkcskc",
138+
"ssh-ecdsa-nistp384-oviiipkcskc",
139+
"ssh-ovvpkcskc",
140+
"ssh-ecdsa-nistp521-ovvpkcskc",
105141
##### OQS_TEMPLATE_FRAGMENT_LIST_ALL_SIGS_END
106142
"ssh-ed25519", # Classical signature algorithm for OpenSSH interop testing
107143
]

‎oqs-utils.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,42 @@ int oqs_utils_is_ecdsa_hybrid(int keytype) {
3939
return 1;
4040
case KEY_ECDSA_NISTP521_MAYO_5:
4141
return 1;
42+
case KEY_ECDSA_NISTP384_CROSS_RSDP_192_BALANCED:
43+
return 1;
44+
case KEY_ECDSA_NISTP384_CROSS_RSDP_192_FAST:
45+
return 1;
46+
case KEY_ECDSA_NISTP384_CROSS_RSDP_192_SMALL:
47+
return 1;
48+
case KEY_ECDSA_NISTP521_CROSS_RSDP_256_BALANCED:
49+
return 1;
50+
case KEY_ECDSA_NISTP521_CROSS_RSDP_256_FAST:
51+
return 1;
52+
case KEY_ECDSA_NISTP521_CROSS_RSDP_256_SMALL:
53+
return 1;
54+
case KEY_ECDSA_NISTP384_CROSS_RSDPG_192_BALANCED:
55+
return 1;
56+
case KEY_ECDSA_NISTP384_CROSS_RSDPG_192_FAST:
57+
return 1;
58+
case KEY_ECDSA_NISTP384_CROSS_RSDPG_192_SMALL:
59+
return 1;
60+
case KEY_ECDSA_NISTP521_CROSS_RSDPG_256_BALANCED:
61+
return 1;
62+
case KEY_ECDSA_NISTP521_CROSS_RSDPG_256_FAST:
63+
return 1;
64+
case KEY_ECDSA_NISTP521_CROSS_RSDPG_256_SMALL:
65+
return 1;
66+
case KEY_ECDSA_NISTP384_OV_III:
67+
return 1;
68+
case KEY_ECDSA_NISTP521_OV_V:
69+
return 1;
70+
case KEY_ECDSA_NISTP384_OV_III_PKC:
71+
return 1;
72+
case KEY_ECDSA_NISTP521_OV_V_PKC:
73+
return 1;
74+
case KEY_ECDSA_NISTP384_OV_III_PKC_SKC:
75+
return 1;
76+
case KEY_ECDSA_NISTP521_OV_V_PKC_SKC:
77+
return 1;
4278
///// OQS_TEMPLATE_FRAGMENT_LIST_ECDSA_HYBRIDS_END
4379
}
4480
return 0;

‎oqs-utils.h

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,25 @@
1616
case KEY_ML_DSA_87: \
1717
case KEY_MAYO_2: \
1818
case KEY_MAYO_3: \
19-
case KEY_MAYO_5
19+
case KEY_MAYO_5: \
20+
case KEY_CROSS_RSDP_192_BALANCED: \
21+
case KEY_CROSS_RSDP_192_FAST: \
22+
case KEY_CROSS_RSDP_192_SMALL: \
23+
case KEY_CROSS_RSDP_256_BALANCED: \
24+
case KEY_CROSS_RSDP_256_FAST: \
25+
case KEY_CROSS_RSDP_256_SMALL: \
26+
case KEY_CROSS_RSDPG_192_BALANCED: \
27+
case KEY_CROSS_RSDPG_192_FAST: \
28+
case KEY_CROSS_RSDPG_192_SMALL: \
29+
case KEY_CROSS_RSDPG_256_BALANCED: \
30+
case KEY_CROSS_RSDPG_256_FAST: \
31+
case KEY_CROSS_RSDPG_256_SMALL: \
32+
case KEY_OV_III: \
33+
case KEY_OV_V: \
34+
case KEY_OV_III_PKC: \
35+
case KEY_OV_V_PKC: \
36+
case KEY_OV_III_PKC_SKC: \
37+
case KEY_OV_V_PKC_SKC
2038

2139
#define CASE_KEY_RSA_HYBRID \
2240
case KEY_RSA3072_FALCON_512: \
@@ -34,7 +52,25 @@
3452
case KEY_ECDSA_NISTP521_ML_DSA_87: \
3553
case KEY_ECDSA_NISTP256_MAYO_2: \
3654
case KEY_ECDSA_NISTP384_MAYO_3: \
37-
case KEY_ECDSA_NISTP521_MAYO_5
55+
case KEY_ECDSA_NISTP521_MAYO_5: \
56+
case KEY_ECDSA_NISTP384_CROSS_RSDP_192_BALANCED: \
57+
case KEY_ECDSA_NISTP384_CROSS_RSDP_192_FAST: \
58+
case KEY_ECDSA_NISTP384_CROSS_RSDP_192_SMALL: \
59+
case KEY_ECDSA_NISTP521_CROSS_RSDP_256_BALANCED: \
60+
case KEY_ECDSA_NISTP521_CROSS_RSDP_256_FAST: \
61+
case KEY_ECDSA_NISTP521_CROSS_RSDP_256_SMALL: \
62+
case KEY_ECDSA_NISTP384_CROSS_RSDPG_192_BALANCED: \
63+
case KEY_ECDSA_NISTP384_CROSS_RSDPG_192_FAST: \
64+
case KEY_ECDSA_NISTP384_CROSS_RSDPG_192_SMALL: \
65+
case KEY_ECDSA_NISTP521_CROSS_RSDPG_256_BALANCED: \
66+
case KEY_ECDSA_NISTP521_CROSS_RSDPG_256_FAST: \
67+
case KEY_ECDSA_NISTP521_CROSS_RSDPG_256_SMALL: \
68+
case KEY_ECDSA_NISTP384_OV_III: \
69+
case KEY_ECDSA_NISTP521_OV_V: \
70+
case KEY_ECDSA_NISTP384_OV_III_PKC: \
71+
case KEY_ECDSA_NISTP521_OV_V_PKC: \
72+
case KEY_ECDSA_NISTP384_OV_III_PKC_SKC: \
73+
case KEY_ECDSA_NISTP521_OV_V_PKC_SKC
3874
///// OQS_TEMPLATE_FRAGMENT_DEFINE_KEY_CASE_MACROS_END
3975

4076
#define CASE_KEY_HYBRID \

‎pathnames.h

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,42 @@
6666
#define _PATH_HOST_ECDSA_NISTP384_MAYO_3_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_mayo3_key"
6767
#define _PATH_HOST_MAYO_5_KEY_FILE SSHDIR "/ssh_host_mayo5_key"
6868
#define _PATH_HOST_ECDSA_NISTP521_MAYO_5_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_mayo5_key"
69+
#define _PATH_HOST_CROSS_RSDP_192_BALANCED_KEY_FILE SSHDIR "/ssh_host_crossrsdp192balanced_key"
70+
#define _PATH_HOST_ECDSA_NISTP384_CROSS_RSDP_192_BALANCED_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_crossrsdp192balanced_key"
71+
#define _PATH_HOST_CROSS_RSDP_192_FAST_KEY_FILE SSHDIR "/ssh_host_crossrsdp192fast_key"
72+
#define _PATH_HOST_ECDSA_NISTP384_CROSS_RSDP_192_FAST_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_crossrsdp192fast_key"
73+
#define _PATH_HOST_CROSS_RSDP_192_SMALL_KEY_FILE SSHDIR "/ssh_host_crossrsdp192small_key"
74+
#define _PATH_HOST_ECDSA_NISTP384_CROSS_RSDP_192_SMALL_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_crossrsdp192small_key"
75+
#define _PATH_HOST_CROSS_RSDP_256_BALANCED_KEY_FILE SSHDIR "/ssh_host_crossrsdp256balanced_key"
76+
#define _PATH_HOST_ECDSA_NISTP521_CROSS_RSDP_256_BALANCED_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_crossrsdp256balanced_key"
77+
#define _PATH_HOST_CROSS_RSDP_256_FAST_KEY_FILE SSHDIR "/ssh_host_crossrsdp256fast_key"
78+
#define _PATH_HOST_ECDSA_NISTP521_CROSS_RSDP_256_FAST_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_crossrsdp256fast_key"
79+
#define _PATH_HOST_CROSS_RSDP_256_SMALL_KEY_FILE SSHDIR "/ssh_host_crossrsdp256small_key"
80+
#define _PATH_HOST_ECDSA_NISTP521_CROSS_RSDP_256_SMALL_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_crossrsdp256small_key"
81+
#define _PATH_HOST_CROSS_RSDPG_192_BALANCED_KEY_FILE SSHDIR "/ssh_host_crossrsdpg192balanced_key"
82+
#define _PATH_HOST_ECDSA_NISTP384_CROSS_RSDPG_192_BALANCED_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_crossrsdpg192balanced_key"
83+
#define _PATH_HOST_CROSS_RSDPG_192_FAST_KEY_FILE SSHDIR "/ssh_host_crossrsdpg192fast_key"
84+
#define _PATH_HOST_ECDSA_NISTP384_CROSS_RSDPG_192_FAST_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_crossrsdpg192fast_key"
85+
#define _PATH_HOST_CROSS_RSDPG_192_SMALL_KEY_FILE SSHDIR "/ssh_host_crossrsdpg192small_key"
86+
#define _PATH_HOST_ECDSA_NISTP384_CROSS_RSDPG_192_SMALL_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_crossrsdpg192small_key"
87+
#define _PATH_HOST_CROSS_RSDPG_256_BALANCED_KEY_FILE SSHDIR "/ssh_host_crossrsdpg256balanced_key"
88+
#define _PATH_HOST_ECDSA_NISTP521_CROSS_RSDPG_256_BALANCED_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_crossrsdpg256balanced_key"
89+
#define _PATH_HOST_CROSS_RSDPG_256_FAST_KEY_FILE SSHDIR "/ssh_host_crossrsdpg256fast_key"
90+
#define _PATH_HOST_ECDSA_NISTP521_CROSS_RSDPG_256_FAST_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_crossrsdpg256fast_key"
91+
#define _PATH_HOST_CROSS_RSDPG_256_SMALL_KEY_FILE SSHDIR "/ssh_host_crossrsdpg256small_key"
92+
#define _PATH_HOST_ECDSA_NISTP521_CROSS_RSDPG_256_SMALL_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_crossrsdpg256small_key"
93+
#define _PATH_HOST_OV_III_KEY_FILE SSHDIR "/ssh_host_oviii_key"
94+
#define _PATH_HOST_ECDSA_NISTP384_OV_III_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_oviii_key"
95+
#define _PATH_HOST_OV_V_KEY_FILE SSHDIR "/ssh_host_ovv_key"
96+
#define _PATH_HOST_ECDSA_NISTP521_OV_V_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_ovv_key"
97+
#define _PATH_HOST_OV_III_PKC_KEY_FILE SSHDIR "/ssh_host_oviiipkc_key"
98+
#define _PATH_HOST_ECDSA_NISTP384_OV_III_PKC_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_oviiipkc_key"
99+
#define _PATH_HOST_OV_V_PKC_KEY_FILE SSHDIR "/ssh_host_ovvpkc_key"
100+
#define _PATH_HOST_ECDSA_NISTP521_OV_V_PKC_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_ovvpkc_key"
101+
#define _PATH_HOST_OV_III_PKC_SKC_KEY_FILE SSHDIR "/ssh_host_oviiipkcskc_key"
102+
#define _PATH_HOST_ECDSA_NISTP384_OV_III_PKC_SKC_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp384_oviiipkcskc_key"
103+
#define _PATH_HOST_OV_V_PKC_SKC_KEY_FILE SSHDIR "/ssh_host_ovvpkcskc_key"
104+
#define _PATH_HOST_ECDSA_NISTP521_OV_V_PKC_SKC_KEY_FILE SSHDIR "/ssh_host_ecdsa_nistp521_ovvpkcskc_key"
69105
///// OQS_TEMPLATE_FRAGMENT_ADD_KEY_FILE_PATHS_END
70106
#define _PATH_DH_MODULI SSHDIR "/moduli"
71107

@@ -130,6 +166,42 @@
130166
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_MAYO_3 _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_mayo3"
131167
#define _PATH_SSH_CLIENT_ID_MAYO_5 _PATH_SSH_USER_DIR "/id_mayo5"
132168
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_MAYO_5 _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_mayo5"
169+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDP_192_BALANCED _PATH_SSH_USER_DIR "/id_crossrsdp192balanced"
170+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDP_192_BALANCED _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_crossrsdp192balanced"
171+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDP_192_FAST _PATH_SSH_USER_DIR "/id_crossrsdp192fast"
172+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDP_192_FAST _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_crossrsdp192fast"
173+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDP_192_SMALL _PATH_SSH_USER_DIR "/id_crossrsdp192small"
174+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDP_192_SMALL _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_crossrsdp192small"
175+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDP_256_BALANCED _PATH_SSH_USER_DIR "/id_crossrsdp256balanced"
176+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDP_256_BALANCED _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_crossrsdp256balanced"
177+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDP_256_FAST _PATH_SSH_USER_DIR "/id_crossrsdp256fast"
178+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDP_256_FAST _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_crossrsdp256fast"
179+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDP_256_SMALL _PATH_SSH_USER_DIR "/id_crossrsdp256small"
180+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDP_256_SMALL _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_crossrsdp256small"
181+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDPG_192_BALANCED _PATH_SSH_USER_DIR "/id_crossrsdpg192balanced"
182+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDPG_192_BALANCED _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_crossrsdpg192balanced"
183+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDPG_192_FAST _PATH_SSH_USER_DIR "/id_crossrsdpg192fast"
184+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDPG_192_FAST _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_crossrsdpg192fast"
185+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDPG_192_SMALL _PATH_SSH_USER_DIR "/id_crossrsdpg192small"
186+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDPG_192_SMALL _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_crossrsdpg192small"
187+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDPG_256_BALANCED _PATH_SSH_USER_DIR "/id_crossrsdpg256balanced"
188+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDPG_256_BALANCED _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_crossrsdpg256balanced"
189+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDPG_256_FAST _PATH_SSH_USER_DIR "/id_crossrsdpg256fast"
190+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDPG_256_FAST _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_crossrsdpg256fast"
191+
#define _PATH_SSH_CLIENT_ID_CROSS_RSDPG_256_SMALL _PATH_SSH_USER_DIR "/id_crossrsdpg256small"
192+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDPG_256_SMALL _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_crossrsdpg256small"
193+
#define _PATH_SSH_CLIENT_ID_OV_III _PATH_SSH_USER_DIR "/id_oviii"
194+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_OV_III _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_oviii"
195+
#define _PATH_SSH_CLIENT_ID_OV_V _PATH_SSH_USER_DIR "/id_ovv"
196+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_OV_V _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_ovv"
197+
#define _PATH_SSH_CLIENT_ID_OV_III_PKC _PATH_SSH_USER_DIR "/id_oviiipkc"
198+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_OV_III_PKC _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_oviiipkc"
199+
#define _PATH_SSH_CLIENT_ID_OV_V_PKC _PATH_SSH_USER_DIR "/id_ovvpkc"
200+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_OV_V_PKC _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_ovvpkc"
201+
#define _PATH_SSH_CLIENT_ID_OV_III_PKC_SKC _PATH_SSH_USER_DIR "/id_oviiipkcskc"
202+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_OV_III_PKC_SKC _PATH_SSH_USER_DIR "/id_ecdsa_nistp384_oviiipkcskc"
203+
#define _PATH_SSH_CLIENT_ID_OV_V_PKC_SKC _PATH_SSH_USER_DIR "/id_ovvpkcskc"
204+
#define _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_OV_V_PKC_SKC _PATH_SSH_USER_DIR "/id_ecdsa_nistp521_ovvpkcskc"
133205
///// OQS_TEMPLATE_FRAGMENT_ADD_ID_FILE_PATHS_END
134206

135207
/*

‎readconf.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2762,6 +2762,24 @@ fill_default_options(Options * options)
27622762
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_MAYO_2, 0);
27632763
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_MAYO_3, 0);
27642764
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_MAYO_5, 0);
2765+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDP_192_BALANCED, 0);
2766+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDP_192_FAST, 0);
2767+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDP_192_SMALL, 0);
2768+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDP_256_BALANCED, 0);
2769+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDP_256_FAST, 0);
2770+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDP_256_SMALL, 0);
2771+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDPG_192_BALANCED, 0);
2772+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDPG_192_FAST, 0);
2773+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDPG_192_SMALL, 0);
2774+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDPG_256_BALANCED, 0);
2775+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDPG_256_FAST, 0);
2776+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_CROSS_RSDPG_256_SMALL, 0);
2777+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_OV_III, 0);
2778+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_OV_V, 0);
2779+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_OV_III_PKC, 0);
2780+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_OV_V_PKC, 0);
2781+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_OV_III_PKC_SKC, 0);
2782+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_OV_V_PKC_SKC, 0);
27652783
#ifdef WITH_OPENSSL
27662784
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_FALCON_512, 0);
27672785
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA3072_SPHINCS_SHA2_128F_SIMPLE, 0);
@@ -2778,6 +2796,24 @@ fill_default_options(Options * options)
27782796
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP256_MAYO_2, 0);
27792797
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_MAYO_3, 0);
27802798
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_MAYO_5, 0);
2799+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDP_192_BALANCED, 0);
2800+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDP_192_FAST, 0);
2801+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDP_192_SMALL, 0);
2802+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDP_256_BALANCED, 0);
2803+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDP_256_FAST, 0);
2804+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDP_256_SMALL, 0);
2805+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDPG_192_BALANCED, 0);
2806+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDPG_192_FAST, 0);
2807+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_CROSS_RSDPG_192_SMALL, 0);
2808+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDPG_256_BALANCED, 0);
2809+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDPG_256_FAST, 0);
2810+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_CROSS_RSDPG_256_SMALL, 0);
2811+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_OV_III, 0);
2812+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_OV_V, 0);
2813+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_OV_III_PKC, 0);
2814+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_OV_V_PKC, 0);
2815+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP384_OV_III_PKC_SKC, 0);
2816+
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA_NISTP521_OV_V_PKC_SKC, 0);
27812817
#endif /* OPENSSL_HAS_ECC */
27822818
#endif /* WITH_OPENSSL */
27832819
///// OQS_TEMPLATE_FRAGMENT_ADD_ID_FILES_END

‎regress/keygen-comment.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,24 @@ for fmt in '' RFC4716 PKCS8 PEM; do
4141
*mayo2*) test -z "$oldfmt" || continue ;;
4242
*mayo3*) test -z "$oldfmt" || continue ;;
4343
*mayo5*) test -z "$oldfmt" || continue ;;
44+
*crossrsdp192balanced*) test -z "$oldfmt" || continue ;;
45+
*crossrsdp192fast*) test -z "$oldfmt" || continue ;;
46+
*crossrsdp192small*) test -z "$oldfmt" || continue ;;
47+
*crossrsdp256balanced*) test -z "$oldfmt" || continue ;;
48+
*crossrsdp256fast*) test -z "$oldfmt" || continue ;;
49+
*crossrsdp256small*) test -z "$oldfmt" || continue ;;
50+
*crossrsdpg192balanced*) test -z "$oldfmt" || continue ;;
51+
*crossrsdpg192fast*) test -z "$oldfmt" || continue ;;
52+
*crossrsdpg192small*) test -z "$oldfmt" || continue ;;
53+
*crossrsdpg256balanced*) test -z "$oldfmt" || continue ;;
54+
*crossrsdpg256fast*) test -z "$oldfmt" || continue ;;
55+
*crossrsdpg256small*) test -z "$oldfmt" || continue ;;
56+
*oviii*) test -z "$oldfmt" || continue ;;
57+
*ovv*) test -z "$oldfmt" || continue ;;
58+
*oviiipkc*) test -z "$oldfmt" || continue ;;
59+
*ovvpkc*) test -z "$oldfmt" || continue ;;
60+
*oviiipkcskc*) test -z "$oldfmt" || continue ;;
61+
*ovvpkcskc*) test -z "$oldfmt" || continue ;;
4462
##### OQS_TEMPLATE_FRAGMENT_EXCLUDE_OQS_ALGS_END
4563
esac
4664
comment="foo bar"

0 commit comments

Comments
 (0)