You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2018/06/19 08:31:46 UTC
qpid-dispatch git commit: DISPATCH-1039: only require client certs if
a ca has been explicitly provided (in order to allow alternative forms of
auth)
Repository: qpid-dispatch
Updated Branches:
refs/heads/master a86e6bf6f -> 88bc3fb62
DISPATCH-1039: only require client certs if a ca has been explicitly provided (in order to allow alternative forms of auth)
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/88bc3fb6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/88bc3fb6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/88bc3fb6
Branch: refs/heads/master
Commit: 88bc3fb620a13e77adee682737bd55e03438c38f
Parents: a86e6bf
Author: Gordon Sim <gs...@redhat.com>
Authored: Mon Jun 18 19:50:19 2018 +0100
Committer: Gordon Sim <gs...@redhat.com>
Committed: Mon Jun 18 19:50:40 2018 +0100
----------------------------------------------------------------------
src/http-libwebsockets.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/88bc3fb6/src/http-libwebsockets.c
----------------------------------------------------------------------
diff --git a/src/http-libwebsockets.c b/src/http-libwebsockets.c
index 6df0cca..ff26f57 100644
--- a/src/http-libwebsockets.c
+++ b/src/http-libwebsockets.c
@@ -295,13 +295,13 @@ static void listener_start(qd_http_listener_t *hl, qd_http_server_t *hs) {
info.ssl_cert_filepath = config->ssl_certificate_file;
info.ssl_private_key_filepath = config->ssl_private_key_file;
info.ssl_private_key_password = config->ssl_password;
- info.ssl_ca_filepath = config->ssl_trusted_certificates;
+ info.ssl_ca_filepath = config->ssl_trusted_certificates ? config->ssl_trusted_certificates : config->ssl_trusted_certificate_db;
info.ssl_cipher_list = config->ssl_ciphers;
info.options |=
LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT |
(config->ssl_required ? 0 : LWS_SERVER_OPTION_ALLOW_NON_SSL_ON_SSL_PORT) |
- (config->requireAuthentication ? LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT : 0);
+ ((config->requireAuthentication && info.ssl_ca_filepath) ? LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT : 0);
}
info.vhost_name = hl->listener->config.host_port;
hl->vhost = lws_create_vhost(hs->context, &info);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org