diff options
-rw-r--r-- | src/lib/libcrypto/pem/pem.h | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h index d1916a1833..d4fb25d47a 100644 --- a/src/lib/libcrypto/pem/pem.h +++ b/src/lib/libcrypto/pem/pem.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pem.h,v 1.17 2016/09/04 16:22:54 jsing Exp $ */ | 1 | /* $OpenBSD: pem.h,v 1.18 2018/05/13 10:47:54 tb Exp $ */ |
2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -385,8 +385,8 @@ int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data, long *len, | |||
385 | #ifndef OPENSSL_NO_BIO | 385 | #ifndef OPENSSL_NO_BIO |
386 | int PEM_read_bio(BIO *bp, char **name, char **header, | 386 | int PEM_read_bio(BIO *bp, char **name, char **header, |
387 | unsigned char **data, long *len); | 387 | unsigned char **data, long *len); |
388 | int PEM_write_bio(BIO *bp, const char *name, char *hdr, unsigned char *data, | 388 | int PEM_write_bio(BIO *bp, const char *name, const char *hdr, |
389 | long len); | 389 | const unsigned char *data, long len); |
390 | int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, | 390 | int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, |
391 | const char *name, BIO *bp, pem_password_cb *cb, void *u); | 391 | const char *name, BIO *bp, pem_password_cb *cb, void *u); |
392 | void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, | 392 | void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, |
@@ -403,8 +403,8 @@ int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc, | |||
403 | 403 | ||
404 | int PEM_read(FILE *fp, char **name, char **header, | 404 | int PEM_read(FILE *fp, char **name, char **header, |
405 | unsigned char **data, long *len); | 405 | unsigned char **data, long *len); |
406 | int PEM_write(FILE *fp, char *name, char *hdr, unsigned char *data, | 406 | int PEM_write(FILE *fp, const char *name, const char *hdr, |
407 | long len); | 407 | const unsigned char *data, long len); |
408 | void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, | 408 | void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, |
409 | pem_password_cb *cb, void *u); | 409 | pem_password_cb *cb, void *u); |
410 | int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, | 410 | int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, |
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 89e9e9a7ec..bffd1fa954 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.46 2018/04/14 07:09:21 tb Exp $ */ | 1 | /* $OpenBSD: pem_lib.c,v 1.47 2018/05/13 10:47:54 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 | * |
@@ -564,7 +564,8 @@ load_iv(char **fromp, unsigned char *to, int num) | |||
564 | } | 564 | } |
565 | 565 | ||
566 | int | 566 | int |
567 | PEM_write(FILE *fp, char *name, char *header, unsigned char *data, long len) | 567 | PEM_write(FILE *fp, const char *name, const char *header, |
568 | const unsigned char *data, long len) | ||
568 | { | 569 | { |
569 | BIO *b; | 570 | BIO *b; |
570 | int ret; | 571 | int ret; |
@@ -580,8 +581,8 @@ PEM_write(FILE *fp, char *name, char *header, unsigned char *data, long len) | |||
580 | } | 581 | } |
581 | 582 | ||
582 | int | 583 | int |
583 | PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data, | 584 | PEM_write_bio(BIO *bp, const char *name, const char *header, |
584 | long len) | 585 | const unsigned char *data, long len) |
585 | { | 586 | { |
586 | int nlen, n, i, j, outl; | 587 | int nlen, n, i, j, outl; |
587 | unsigned char *buf = NULL; | 588 | unsigned char *buf = NULL; |