commit 74678cc2f8132ad34f7c33731c4765cf3083de8c
author Bodo Möller <bodo@openssl.org> Wed Jul 21 20:57:16 1999 +0000
committer Bodo Möller <bodo@openssl.org> Wed Jul 21 20:57:16 1999 +0000
tree da0cd26e2c32fc9b0bf540be33964282b4a5ed9d
parent 664b99853cbefd2dc9f6ee56631f36b0f63d0d06

Additional user data argument to pem_password_cb function type
and to lots of PEM_... functions.
Submitted by: Damien Miller <dmiller@ilogic.com.au>

ssl/ssl_cert.c

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index ec2eb61..19ade2f 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -571,7 +571,7 @@
 
 	for (;;)
 		{
-		if (PEM_read_bio_X509(in,&x,NULL) == NULL)
+		if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL)
 			break;
 		if ((xn=X509_get_subject_name(x)) == NULL) goto err;
 		/* check for duplicates */
@@ -632,7 +632,7 @@
 
     for (;;)
 	{
-	if (PEM_read_bio_X509(in,&x,NULL) == NULL)
+	if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL)
 	    break;
 	if ((xn=X509_get_subject_name(x)) == NULL) goto err;
 	xn=X509_NAME_dup(xn);