From 9e457871b426ba7ea5d01137e823f307f06dfdbc Mon Sep 17 00:00:00 2001 From: James Tyra Date: Mon, 30 Dec 2019 18:11:34 -0600 Subject: [PATCH] Update IXSocketMbedTLS.cpp (#139) fix bug with mbedtls server certificate loading. --- ixwebsocket/IXSocketMbedTLS.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ixwebsocket/IXSocketMbedTLS.cpp b/ixwebsocket/IXSocketMbedTLS.cpp index d66d9754..dc6cc5c5 100644 --- a/ixwebsocket/IXSocketMbedTLS.cpp +++ b/ixwebsocket/IXSocketMbedTLS.cpp @@ -82,6 +82,11 @@ namespace ix errMsg = "Cannot parse key file '" + _tlsOptions.keyFile + "'"; return false; } + if (mbedtls_ssl_conf_own_cert(&_conf, &_cert, &_pkey) < 0) + { + errMsg = "Problem configuring cert '" + _tlsOptions.certFile + "'"; + return false; + } } if (_tlsOptions.isPeerVerifyDisabled()) @@ -105,11 +110,6 @@ namespace ix } mbedtls_ssl_conf_ca_chain(&_conf, &_cacert, NULL); - - if (_tlsOptions.hasCertAndKey()) - { - mbedtls_ssl_conf_own_cert(&_conf, &_cert, &_pkey); - } } if (mbedtls_ssl_setup(&_ssl, &_conf) != 0)