diff options
-rw-r--r-- | src/lib/libssl/t1_lib.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index c4c58e6675..105acf1cbf 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.187 2022/06/30 16:05:07 tb Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.188 2022/06/30 16:18:03 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -157,119 +157,119 @@ struct curve { | |||
157 | 157 | ||
158 | static const struct curve nid_list[] = { | 158 | static const struct curve nid_list[] = { |
159 | [1] = { | 159 | [1] = { |
160 | .nid = NID_sect163k1, /* sect163k1 (1) */ | 160 | .nid = NID_sect163k1, |
161 | .bits = 80, | 161 | .bits = 80, |
162 | }, | 162 | }, |
163 | [2] = { | 163 | [2] = { |
164 | .nid = NID_sect163r1, /* sect163r1 (2) */ | 164 | .nid = NID_sect163r1, |
165 | .bits = 80, | 165 | .bits = 80, |
166 | }, | 166 | }, |
167 | [3] = { | 167 | [3] = { |
168 | .nid = NID_sect163r2, /* sect163r2 (3) */ | 168 | .nid = NID_sect163r2, |
169 | .bits = 80, | 169 | .bits = 80, |
170 | }, | 170 | }, |
171 | [4] = { | 171 | [4] = { |
172 | .nid = NID_sect193r1, /* sect193r1 (4) */ | 172 | .nid = NID_sect193r1, |
173 | .bits = 80, | 173 | .bits = 80, |
174 | }, | 174 | }, |
175 | [5] = { | 175 | [5] = { |
176 | .nid = NID_sect193r2, /* sect193r2 (5) */ | 176 | .nid = NID_sect193r2, |
177 | .bits = 80, | 177 | .bits = 80, |
178 | }, | 178 | }, |
179 | [6] = { | 179 | [6] = { |
180 | .nid = NID_sect233k1, /* sect233k1 (6) */ | 180 | .nid = NID_sect233k1, |
181 | .bits = 112, | 181 | .bits = 112, |
182 | }, | 182 | }, |
183 | [7] = { | 183 | [7] = { |
184 | .nid = NID_sect233r1, /* sect233r1 (7) */ | 184 | .nid = NID_sect233r1, |
185 | .bits = 112, | 185 | .bits = 112, |
186 | }, | 186 | }, |
187 | [8] = { | 187 | [8] = { |
188 | .nid = NID_sect239k1, /* sect239k1 (8) */ | 188 | .nid = NID_sect239k1, |
189 | .bits = 112, | 189 | .bits = 112, |
190 | }, | 190 | }, |
191 | [9] = { | 191 | [9] = { |
192 | .nid = NID_sect283k1, /* sect283k1 (9) */ | 192 | .nid = NID_sect283k1, |
193 | .bits = 128, | 193 | .bits = 128, |
194 | }, | 194 | }, |
195 | [10] = { | 195 | [10] = { |
196 | .nid = NID_sect283r1, /* sect283r1 (10) */ | 196 | .nid = NID_sect283r1, |
197 | .bits = 128, | 197 | .bits = 128, |
198 | }, | 198 | }, |
199 | [11] = { | 199 | [11] = { |
200 | .nid = NID_sect409k1, /* sect409k1 (11) */ | 200 | .nid = NID_sect409k1, |
201 | .bits = 192, | 201 | .bits = 192, |
202 | }, | 202 | }, |
203 | [12] = { | 203 | [12] = { |
204 | .nid = NID_sect409r1, /* sect409r1 (12) */ | 204 | .nid = NID_sect409r1, |
205 | .bits = 192, | 205 | .bits = 192, |
206 | }, | 206 | }, |
207 | [13] = { | 207 | [13] = { |
208 | .nid = NID_sect571k1, /* sect571k1 (13) */ | 208 | .nid = NID_sect571k1, |
209 | .bits = 256, | 209 | .bits = 256, |
210 | }, | 210 | }, |
211 | [14] = { | 211 | [14] = { |
212 | .nid = NID_sect571r1, /* sect571r1 (14) */ | 212 | .nid = NID_sect571r1, |
213 | .bits = 256, | 213 | .bits = 256, |
214 | }, | 214 | }, |
215 | [15] = { | 215 | [15] = { |
216 | .nid = NID_secp160k1, /* secp160k1 (15) */ | 216 | .nid = NID_secp160k1, |
217 | .bits = 80, | 217 | .bits = 80, |
218 | }, | 218 | }, |
219 | [16] = { | 219 | [16] = { |
220 | .nid = NID_secp160r1, /* secp160r1 (16) */ | 220 | .nid = NID_secp160r1, |
221 | .bits = 80, | 221 | .bits = 80, |
222 | }, | 222 | }, |
223 | [17] = { | 223 | [17] = { |
224 | .nid = NID_secp160r2, /* secp160r2 (17) */ | 224 | .nid = NID_secp160r2, |
225 | .bits = 80, | 225 | .bits = 80, |
226 | }, | 226 | }, |
227 | [18] = { | 227 | [18] = { |
228 | .nid = NID_secp192k1, /* secp192k1 (18) */ | 228 | .nid = NID_secp192k1, |
229 | .bits = 80, | 229 | .bits = 80, |
230 | }, | 230 | }, |
231 | [19] = { | 231 | [19] = { |
232 | .nid = NID_X9_62_prime192v1, /* secp192r1 (19) */ | 232 | .nid = NID_X9_62_prime192v1, /* aka secp192r1 */ |
233 | .bits = 80, | 233 | .bits = 80, |
234 | }, | 234 | }, |
235 | [20] = { | 235 | [20] = { |
236 | .nid = NID_secp224k1, /* secp224k1 (20) */ | 236 | .nid = NID_secp224k1, |
237 | .bits = 112, | 237 | .bits = 112, |
238 | }, | 238 | }, |
239 | [21] = { | 239 | [21] = { |
240 | .nid = NID_secp224r1, /* secp224r1 (21) */ | 240 | .nid = NID_secp224r1, |
241 | .bits = 112, | 241 | .bits = 112, |
242 | }, | 242 | }, |
243 | [22] = { | 243 | [22] = { |
244 | .nid = NID_secp256k1, /* secp256k1 (22) */ | 244 | .nid = NID_secp256k1, |
245 | .bits = 128, | 245 | .bits = 128, |
246 | }, | 246 | }, |
247 | [23] = { | 247 | [23] = { |
248 | .nid = NID_X9_62_prime256v1, /* secp256r1 (23) */ | 248 | .nid = NID_X9_62_prime256v1, /* aka secp256r1 */ |
249 | .bits = 128, | 249 | .bits = 128, |
250 | }, | 250 | }, |
251 | [24] = { | 251 | [24] = { |
252 | .nid = NID_secp384r1, /* secp384r1 (24) */ | 252 | .nid = NID_secp384r1, |
253 | .bits = 192, | 253 | .bits = 192, |
254 | }, | 254 | }, |
255 | [25] = { | 255 | [25] = { |
256 | .nid = NID_secp521r1, /* secp521r1 (25) */ | 256 | .nid = NID_secp521r1, |
257 | .bits = 256, | 257 | .bits = 256, |
258 | }, | 258 | }, |
259 | [26] = { | 259 | [26] = { |
260 | .nid = NID_brainpoolP256r1, /* brainpoolP256r1 (26) */ | 260 | .nid = NID_brainpoolP256r1, |
261 | .bits = 128, | 261 | .bits = 128, |
262 | }, | 262 | }, |
263 | [27] = { | 263 | [27] = { |
264 | .nid = NID_brainpoolP384r1, /* brainpoolP384r1 (27) */ | 264 | .nid = NID_brainpoolP384r1, |
265 | .bits = 192, | 265 | .bits = 192, |
266 | }, | 266 | }, |
267 | [28] = { | 267 | [28] = { |
268 | .nid = NID_brainpoolP512r1, /* brainpoolP512r1 (28) */ | 268 | .nid = NID_brainpoolP512r1, |
269 | .bits = 256, | 269 | .bits = 256, |
270 | }, | 270 | }, |
271 | [29] = { | 271 | [29] = { |
272 | .nid = NID_X25519, /* X25519 (29) */ | 272 | .nid = NID_X25519, |
273 | .bits = 128, | 273 | .bits = 128, |
274 | }, | 274 | }, |
275 | }; | 275 | }; |