summaryrefslogtreecommitdiffstats
path: root/apps/x509.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>1999-07-21 20:57:16 +0000
committerBodo Möller <bodo@openssl.org>1999-07-21 20:57:16 +0000
commit74678cc2f8132ad34f7c33731c4765cf3083de8c (patch)
treeda0cd26e2c32fc9b0bf540be33964282b4a5ed9d /apps/x509.c
parent664b99853cbefd2dc9f6ee56631f36b0f63d0d06 (diff)
Additional user data argument to pem_password_cb function type
and to lots of PEM_... functions. Submitted by: Damien Miller <dmiller@ilogic.com.au>
Diffstat (limited to 'apps/x509.c')
-rw-r--r--apps/x509.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/x509.c b/apps/x509.c
index 1024c0d3f7..2e2d18bea4 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -377,7 +377,7 @@ bad:
goto end;
}
}
- req=PEM_read_bio_X509_REQ(in,NULL,NULL);
+ req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL);
BIO_free(in);
if (req == NULL) { perror(infile); goto end; }
@@ -948,7 +948,7 @@ static EVP_PKEY *load_key(char *file, int format)
#endif
if (format == FORMAT_PEM)
{
- pkey=PEM_read_bio_PrivateKey(key,NULL,NULL);
+ pkey=PEM_read_bio_PrivateKey(key,NULL,NULL,NULL);
}
else
{
@@ -1031,7 +1031,7 @@ static X509 *load_cert(char *file, int format)
ah->data=NULL;
}
else if (format == FORMAT_PEM)
- x=PEM_read_bio_X509(cert,NULL,NULL);
+ x=PEM_read_bio_X509(cert,NULL,NULL,NULL);
else {
BIO_printf(bio_err,"bad input format specified for input cert\n");
goto end;