X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fpem%2Fpem.h;h=5fb903e60f68b4b4c272f10f1ac50a9abae32ef1;hb=7b3e11c54466f1da8b707c932e308d345fd61101;hp=e09ce80c4c07f1ab0d29f221f6666aa8c07fe1bd;hpb=afb14cda8c70d18b97bbf3419bd308ba5b65f3b9;p=oweals%2Fopenssl.git diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index e09ce80c4c..5fb903e60f 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -411,8 +411,8 @@ int PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len, #ifndef OPENSSL_NO_BIO int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,long *len); -int PEM_write_bio(BIO *bp,const char *name,char *hdr,unsigned char *data, - long len); +int PEM_write_bio(BIO *bp,const char *name, const char *hdr, + const unsigned char *data, long len); int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp, pem_password_cb *cb, void *u); void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, @@ -428,7 +428,8 @@ int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc, int PEM_read(FILE *fp, char **name, char **header, unsigned char **data,long *len); -int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len); +int PEM_write(FILE *fp, const char *name, const char *hdr, + const unsigned char *data, long len); void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, pem_password_cb *cb, void *u); int PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp, @@ -594,8 +595,10 @@ void ERR_load_PEM_strings(void); #define PEM_F_PEM_PK8PKEY 119 #define PEM_F_PEM_READ 108 #define PEM_F_PEM_READ_BIO 109 +#define PEM_F_PEM_READ_BIO_DHPARAMS 141 #define PEM_F_PEM_READ_BIO_PARAMETERS 140 #define PEM_F_PEM_READ_BIO_PRIVATEKEY 123 +#define PEM_F_PEM_READ_DHPARAMS 142 #define PEM_F_PEM_READ_PRIVATEKEY 124 #define PEM_F_PEM_SEALFINAL 110 #define PEM_F_PEM_SEALINIT 111