1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

Add some improvements as suggested by Kaspar

- expand comment in config file
- check username == NULL
- detect SRP support via SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB, not via openssl
  version
- rename rv variable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1348653 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-06-10 19:50:25 +00:00
parent 1a175ccdf9
commit 6dd8ce1c33
4 changed files with 15 additions and 10 deletions

View File

@@ -532,7 +532,7 @@ static void ssl_init_ctx_tls_extensions(server_rec *s,
* TLS-SRP support
*/
if (mctx->srp_vfile != NULL) {
int rv;
int err;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02308)
"Using SRP verifier file [%s]", mctx->srp_vfile);
@@ -545,10 +545,10 @@ static void ssl_init_ctx_tls_extensions(server_rec *s,
ssl_die();
}
rv = SRP_VBASE_init(mctx->srp_vbase, mctx->srp_vfile);
if (rv != SRP_NO_ERROR) {
err = SRP_VBASE_init(mctx->srp_vbase, mctx->srp_vfile);
if (err != SRP_NO_ERROR) {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02310)
"Unable to load SRP verifier file [error %d]", rv);
"Unable to load SRP verifier file [error %d]", err);
ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s);
ssl_die();
}