From 77864d236c0a524f7d9529e23d7d70684c7ca11a Mon Sep 17 00:00:00 2001 From: Nipa Kumar Date: Thu, 11 Aug 2016 10:24:35 -0700 Subject: [PATCH] Add a log message before assert when ssl mode set fails. Change-Id: Ic2d9dd8e81c1e044e30bc6a89b5d2e3a4ddabfaf Closes-Bug:1523877 --- src/xmpp/xmpp_client.cc | 6 +++++- src/xmpp/xmpp_server.cc | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/xmpp/xmpp_client.cc b/src/xmpp/xmpp_client.cc index ba8f5f3f8bd..a6e126edda1 100644 --- a/src/xmpp/xmpp_client.cc +++ b/src/xmpp/xmpp_client.cc @@ -82,7 +82,11 @@ XmppClient::XmppClient(EventManager *evm, const XmppChannelConfig *config) // Verify peer has CA signed certificate ctx->set_verify_mode(boost::asio::ssl::verify_peer, ec); - assert(ec.value() == 0); + if (ec.value() != 0) { + LOG(ERROR, "Error : " << ec.message() + << ", while setting ssl verification mode"); + exit(EINVAL); + } ctx->load_verify_file(config->path_to_ca_cert, ec); if (ec.value() != 0) { diff --git a/src/xmpp/xmpp_server.cc b/src/xmpp/xmpp_server.cc index 6af6c67b550..9fd5a87b978 100644 --- a/src/xmpp/xmpp_server.cc +++ b/src/xmpp/xmpp_server.cc @@ -88,7 +88,11 @@ XmppServer::XmppServer(EventManager *evm, const string &server_addr, // Verify peer has CA signed certificate ctx->set_verify_mode(boost::asio::ssl::verify_peer, ec); - assert(ec.value() == 0); + if (ec.value() != 0) { + LOG(ERROR, "Error : " << ec.message() + << ", while setting ssl verification mode"); + exit(EINVAL); + } ctx->load_verify_file(config->path_to_ca_cert, ec); if (ec.value() != 0) {