tag version

Update IXSocketMbedTLS.cpp (#139 )
fix bug with mbedtls server certificate loading.
2019-12-30 17:17:28 -08:00 · 2019-12-30 16:11:34 -08:00
1 changed files with 5 additions and 5 deletions
--- 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)
Author	SHA1	Message	Date
Benjamin Sergeant	0520329350	tag version	2019-12-30 17:17:28 -08:00
James Tyra	ba88a05b74	Update IXSocketMbedTLS.cpp (#139 ) fix bug with mbedtls server certificate loading.	2019-12-30 16:11:34 -08:00