diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/ameth_lib.c')
-rw-r--r-- | src/lib/libcrypto/asn1/ameth_lib.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c index e9f9927620..5a1dfd7ce3 100644 --- a/src/lib/libcrypto/asn1/ameth_lib.c +++ b/src/lib/libcrypto/asn1/ameth_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ameth_lib.c,v 1.30 2022/11/26 16:08:50 tb Exp $ */ | 1 | /* $OpenBSD: ameth_lib.c,v 1.31 2023/07/05 21:23:36 beck Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -120,6 +120,7 @@ EVP_PKEY_asn1_get_count(void) | |||
120 | 120 | ||
121 | return num; | 121 | return num; |
122 | } | 122 | } |
123 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get_count); | ||
123 | 124 | ||
124 | const EVP_PKEY_ASN1_METHOD * | 125 | const EVP_PKEY_ASN1_METHOD * |
125 | EVP_PKEY_asn1_get0(int idx) | 126 | EVP_PKEY_asn1_get0(int idx) |
@@ -135,6 +136,7 @@ EVP_PKEY_asn1_get0(int idx) | |||
135 | 136 | ||
136 | return sk_EVP_PKEY_ASN1_METHOD_value(asn1_app_methods, idx); | 137 | return sk_EVP_PKEY_ASN1_METHOD_value(asn1_app_methods, idx); |
137 | } | 138 | } |
139 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get0); | ||
138 | 140 | ||
139 | static const EVP_PKEY_ASN1_METHOD * | 141 | static const EVP_PKEY_ASN1_METHOD * |
140 | pkey_asn1_find(int pkey_id) | 142 | pkey_asn1_find(int pkey_id) |
@@ -183,6 +185,7 @@ EVP_PKEY_asn1_find(ENGINE **pe, int type) | |||
183 | } | 185 | } |
184 | return mp; | 186 | return mp; |
185 | } | 187 | } |
188 | LCRYPTO_ALIAS(EVP_PKEY_asn1_find); | ||
186 | 189 | ||
187 | const EVP_PKEY_ASN1_METHOD * | 190 | const EVP_PKEY_ASN1_METHOD * |
188 | EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) | 191 | EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) |
@@ -219,6 +222,7 @@ EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) | |||
219 | } | 222 | } |
220 | return NULL; | 223 | return NULL; |
221 | } | 224 | } |
225 | LCRYPTO_ALIAS(EVP_PKEY_asn1_find_str); | ||
222 | 226 | ||
223 | int | 227 | int |
224 | EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) | 228 | EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) |
@@ -234,6 +238,7 @@ EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) | |||
234 | 238 | ||
235 | return 1; | 239 | return 1; |
236 | } | 240 | } |
241 | LCRYPTO_ALIAS(EVP_PKEY_asn1_add0); | ||
237 | 242 | ||
238 | int | 243 | int |
239 | EVP_PKEY_asn1_add_alias(int to, int from) | 244 | EVP_PKEY_asn1_add_alias(int to, int from) |
@@ -251,6 +256,7 @@ EVP_PKEY_asn1_add_alias(int to, int from) | |||
251 | } | 256 | } |
252 | return 1; | 257 | return 1; |
253 | } | 258 | } |
259 | LCRYPTO_ALIAS(EVP_PKEY_asn1_add_alias); | ||
254 | 260 | ||
255 | int | 261 | int |
256 | EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, | 262 | EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, |
@@ -271,12 +277,14 @@ EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, | |||
271 | *ppem_str = ameth->pem_str; | 277 | *ppem_str = ameth->pem_str; |
272 | return 1; | 278 | return 1; |
273 | } | 279 | } |
280 | LCRYPTO_ALIAS(EVP_PKEY_asn1_get0_info); | ||
274 | 281 | ||
275 | const EVP_PKEY_ASN1_METHOD* | 282 | const EVP_PKEY_ASN1_METHOD* |
276 | EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) | 283 | EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) |
277 | { | 284 | { |
278 | return pkey->ameth; | 285 | return pkey->ameth; |
279 | } | 286 | } |
287 | LCRYPTO_ALIAS(EVP_PKEY_get0_asn1); | ||
280 | 288 | ||
281 | EVP_PKEY_ASN1_METHOD* | 289 | EVP_PKEY_ASN1_METHOD* |
282 | EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) | 290 | EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) |
@@ -306,6 +314,7 @@ EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) | |||
306 | EVP_PKEY_asn1_free(ameth); | 314 | EVP_PKEY_asn1_free(ameth); |
307 | return NULL; | 315 | return NULL; |
308 | } | 316 | } |
317 | LCRYPTO_ALIAS(EVP_PKEY_asn1_new); | ||
309 | 318 | ||
310 | void | 319 | void |
311 | EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src) | 320 | EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src) |
@@ -326,6 +335,7 @@ EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, const EVP_PKEY_ASN1_METHOD *src) | |||
326 | dst->pem_str = preserve.pem_str; | 335 | dst->pem_str = preserve.pem_str; |
327 | dst->info = preserve.info; | 336 | dst->info = preserve.info; |
328 | } | 337 | } |
338 | LCRYPTO_ALIAS(EVP_PKEY_asn1_copy); | ||
329 | 339 | ||
330 | void | 340 | void |
331 | EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth) | 341 | EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth) |
@@ -336,6 +346,7 @@ EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth) | |||
336 | free(ameth); | 346 | free(ameth); |
337 | } | 347 | } |
338 | } | 348 | } |
349 | LCRYPTO_ALIAS(EVP_PKEY_asn1_free); | ||
339 | 350 | ||
340 | void | 351 | void |
341 | EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, | 352 | EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -354,6 +365,7 @@ EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, | |||
354 | ameth->pkey_size = pkey_size; | 365 | ameth->pkey_size = pkey_size; |
355 | ameth->pkey_bits = pkey_bits; | 366 | ameth->pkey_bits = pkey_bits; |
356 | } | 367 | } |
368 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_public); | ||
357 | 369 | ||
358 | void | 370 | void |
359 | EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, | 371 | EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -366,6 +378,7 @@ EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, | |||
366 | ameth->priv_encode = priv_encode; | 378 | ameth->priv_encode = priv_encode; |
367 | ameth->priv_print = priv_print; | 379 | ameth->priv_print = priv_print; |
368 | } | 380 | } |
381 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_private); | ||
369 | 382 | ||
370 | void | 383 | void |
371 | EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth, | 384 | EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -384,6 +397,7 @@ EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth, | |||
384 | ameth->param_cmp = param_cmp; | 397 | ameth->param_cmp = param_cmp; |
385 | ameth->param_print = param_print; | 398 | ameth->param_print = param_print; |
386 | } | 399 | } |
400 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_param); | ||
387 | 401 | ||
388 | void | 402 | void |
389 | EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, | 403 | EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -391,6 +405,7 @@ EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, | |||
391 | { | 405 | { |
392 | ameth->pkey_free = pkey_free; | 406 | ameth->pkey_free = pkey_free; |
393 | } | 407 | } |
408 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_free); | ||
394 | 409 | ||
395 | void | 410 | void |
396 | EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, | 411 | EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -398,6 +413,7 @@ EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, | |||
398 | { | 413 | { |
399 | ameth->pkey_ctrl = pkey_ctrl; | 414 | ameth->pkey_ctrl = pkey_ctrl; |
400 | } | 415 | } |
416 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_ctrl); | ||
401 | 417 | ||
402 | void | 418 | void |
403 | EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, | 419 | EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -405,6 +421,7 @@ EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth, | |||
405 | { | 421 | { |
406 | ameth->pkey_security_bits = pkey_security_bits; | 422 | ameth->pkey_security_bits = pkey_security_bits; |
407 | } | 423 | } |
424 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_security_bits); | ||
408 | 425 | ||
409 | void | 426 | void |
410 | EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, | 427 | EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -412,6 +429,7 @@ EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
412 | { | 429 | { |
413 | ameth->pkey_check = pkey_check; | 430 | ameth->pkey_check = pkey_check; |
414 | } | 431 | } |
432 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_check); | ||
415 | 433 | ||
416 | void | 434 | void |
417 | EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, | 435 | EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -419,6 +437,7 @@ EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
419 | { | 437 | { |
420 | ameth->pkey_public_check = pkey_public_check; | 438 | ameth->pkey_public_check = pkey_public_check; |
421 | } | 439 | } |
440 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_public_check); | ||
422 | 441 | ||
423 | void | 442 | void |
424 | EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, | 443 | EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, |
@@ -426,3 +445,4 @@ EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
426 | { | 445 | { |
427 | ameth->pkey_param_check = pkey_param_check; | 446 | ameth->pkey_param_check = pkey_param_check; |
428 | } | 447 | } |
448 | LCRYPTO_ALIAS(EVP_PKEY_asn1_set_param_check); | ||