Author: mturk
Date: Wed Nov 23 15:32:44 2011
New Revision: 1205442
URL: http://svn.apache.org/viewvc?rev=1205442&view=rev
Log:
Make sure we have password callback set
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1205442&r1=1205441&r2=1205442&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Nov 23 15:32:44 2011
@@ -484,6 +484,8 @@ static X509 *load_pem_cert(tcn_ssl_ctxt_
BIO_free(bio);
return NULL;
}
+ if (!cb_data)
+ cb_data = &tcn_password_callback;
cert = PEM_read_bio_X509_AUX(bio, NULL,
(pem_password_cb *)SSL_password_callback,
(void *)cb_data);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
