Author: rjung Date: Sun May 24 17:52:23 2015 New Revision: 1681505 URL: http://svn.apache.org/r1681505 Log: Read DH params only from first certificate in case multiple certificates are configured.
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=1681505&r1=1681504&r2=1681505&view=diff ============================================================================== --- tomcat/native/trunk/native/src/sslcontext.c (original) +++ tomcat/native/trunk/native/src/sslcontext.c Sun May 24 17:52:23 2015 @@ -770,7 +770,7 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, */ /* XXX Does this also work for pkcs12 or only for PEM files? * If only for PEM files move above to the PEM handling */ - if ((dhparams = SSL_dh_GetParamFromFile(cert_file))) { + if ((idx == 0) && (dhparams = SSL_dh_GetParamFromFile(cert_file))) { SSL_CTX_set_tmp_dh(c->ctx, dhparams); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org