diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pem_lib.c')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 72cdd41b0d..3f23a0131b 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_lib.c,v 1.52 2022/11/26 16:08:53 tb Exp $ */ | 1 | /* $OpenBSD: pem_lib.c,v 1.53 2023/07/07 13:40:44 beck 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 | * |
| @@ -127,6 +127,7 @@ PEM_def_callback(char *buf, int num, int w, void *key) | |||
| 127 | } | 127 | } |
| 128 | return (int)l; | 128 | return (int)l; |
| 129 | } | 129 | } |
| 130 | LCRYPTO_ALIAS(PEM_def_callback); | ||
| 130 | 131 | ||
| 131 | void | 132 | void |
| 132 | PEM_proc_type(char *buf, int type) | 133 | PEM_proc_type(char *buf, int type) |
| @@ -146,6 +147,7 @@ PEM_proc_type(char *buf, int type) | |||
| 146 | strlcat(buf, str, PEM_BUFSIZE); | 147 | strlcat(buf, str, PEM_BUFSIZE); |
| 147 | strlcat(buf, "\n", PEM_BUFSIZE); | 148 | strlcat(buf, "\n", PEM_BUFSIZE); |
| 148 | } | 149 | } |
| 150 | LCRYPTO_ALIAS(PEM_proc_type); | ||
| 149 | 151 | ||
| 150 | void | 152 | void |
| 151 | PEM_dek_info(char *buf, const char *type, int len, char *str) | 153 | PEM_dek_info(char *buf, const char *type, int len, char *str) |
| @@ -167,6 +169,7 @@ PEM_dek_info(char *buf, const char *type, int len, char *str) | |||
| 167 | buf[j + i * 2] = '\n'; | 169 | buf[j + i * 2] = '\n'; |
| 168 | buf[j + i * 2 + 1] = '\0'; | 170 | buf[j + i * 2 + 1] = '\0'; |
| 169 | } | 171 | } |
| 172 | LCRYPTO_ALIAS(PEM_dek_info); | ||
| 170 | 173 | ||
| 171 | void * | 174 | void * |
| 172 | PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, | 175 | PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, |
| @@ -184,6 +187,7 @@ PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, | |||
| 184 | BIO_free(b); | 187 | BIO_free(b); |
| 185 | return (ret); | 188 | return (ret); |
| 186 | } | 189 | } |
| 190 | LCRYPTO_ALIAS(PEM_ASN1_read); | ||
| 187 | 191 | ||
| 188 | static int | 192 | static int |
| 189 | check_pem(const char *nm, const char *name) | 193 | check_pem(const char *nm, const char *name) |
| @@ -322,6 +326,7 @@ err: | |||
| 322 | free(data); | 326 | free(data); |
| 323 | return ret; | 327 | return ret; |
| 324 | } | 328 | } |
| 329 | LCRYPTO_ALIAS(PEM_bytes_read_bio); | ||
| 325 | 330 | ||
| 326 | int | 331 | int |
| 327 | PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x, | 332 | PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x, |
| @@ -340,6 +345,7 @@ PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x, | |||
| 340 | BIO_free(b); | 345 | BIO_free(b); |
| 341 | return (ret); | 346 | return (ret); |
| 342 | } | 347 | } |
| 348 | LCRYPTO_ALIAS(PEM_ASN1_write); | ||
| 343 | 349 | ||
| 344 | int | 350 | int |
| 345 | PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x, | 351 | PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x, |
| @@ -438,6 +444,7 @@ err: | |||
| 438 | freezero(data, (unsigned int)dsize); | 444 | freezero(data, (unsigned int)dsize); |
| 439 | return (ret); | 445 | return (ret); |
| 440 | } | 446 | } |
| 447 | LCRYPTO_ALIAS(PEM_ASN1_write_bio); | ||
| 441 | 448 | ||
| 442 | int | 449 | int |
| 443 | PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, | 450 | PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, |
| @@ -483,6 +490,7 @@ PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, | |||
| 483 | *plen = j + i; | 490 | *plen = j + i; |
| 484 | return (1); | 491 | return (1); |
| 485 | } | 492 | } |
| 493 | LCRYPTO_ALIAS(PEM_do_header); | ||
| 486 | 494 | ||
| 487 | int | 495 | int |
| 488 | PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) | 496 | PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) |
| @@ -544,6 +552,7 @@ PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) | |||
| 544 | 552 | ||
| 545 | return (1); | 553 | return (1); |
| 546 | } | 554 | } |
| 555 | LCRYPTO_ALIAS(PEM_get_EVP_CIPHER_INFO); | ||
| 547 | 556 | ||
| 548 | static int | 557 | static int |
| 549 | load_iv(char **fromp, unsigned char *to, int num) | 558 | load_iv(char **fromp, unsigned char *to, int num) |
| @@ -590,6 +599,7 @@ PEM_write(FILE *fp, const char *name, const char *header, | |||
| 590 | BIO_free(b); | 599 | BIO_free(b); |
| 591 | return (ret); | 600 | return (ret); |
| 592 | } | 601 | } |
| 602 | LCRYPTO_ALIAS(PEM_write); | ||
| 593 | 603 | ||
| 594 | int | 604 | int |
| 595 | PEM_write_bio(BIO *bp, const char *name, const char *header, | 605 | PEM_write_bio(BIO *bp, const char *name, const char *header, |
| @@ -647,6 +657,7 @@ err: | |||
| 647 | PEMerror(reason); | 657 | PEMerror(reason); |
| 648 | return (0); | 658 | return (0); |
| 649 | } | 659 | } |
| 660 | LCRYPTO_ALIAS(PEM_write_bio); | ||
| 650 | 661 | ||
| 651 | int | 662 | int |
| 652 | PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len) | 663 | PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len) |
| @@ -663,6 +674,7 @@ PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len) | |||
| 663 | BIO_free(b); | 674 | BIO_free(b); |
| 664 | return (ret); | 675 | return (ret); |
| 665 | } | 676 | } |
| 677 | LCRYPTO_ALIAS(PEM_read); | ||
| 666 | 678 | ||
| 667 | int | 679 | int |
| 668 | PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data, | 680 | PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data, |
| @@ -835,6 +847,7 @@ err: | |||
| 835 | BUF_MEM_free(dataB); | 847 | BUF_MEM_free(dataB); |
| 836 | return (0); | 848 | return (0); |
| 837 | } | 849 | } |
| 850 | LCRYPTO_ALIAS(PEM_read_bio); | ||
| 838 | 851 | ||
| 839 | /* Check pem string and return prefix length. | 852 | /* Check pem string and return prefix length. |
| 840 | * If for example the pem_str == "RSA PRIVATE KEY" and suffix = "PRIVATE KEY" | 853 | * If for example the pem_str == "RSA PRIVATE KEY" and suffix = "PRIVATE KEY" |
