From 95dd03b298ffe54ef9eca07ae2191ec150d2b1cb Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Tue, 1 Oct 2019 15:58:35 -0700 Subject: [PATCH] Add mbed tls version in user agent string + set user agent properly when enabling openssl on macOS --- ixwebsocket/IXUserAgent.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ixwebsocket/IXUserAgent.cpp b/ixwebsocket/IXUserAgent.cpp index aa43d921..3f1394a1 100644 --- a/ixwebsocket/IXUserAgent.cpp +++ b/ixwebsocket/IXUserAgent.cpp @@ -46,7 +46,9 @@ #endif // SSL -#if defined(IXWEBSOCKET_USE_OPEN_SSL) +#ifdef IXWEBSOCKET_USE_MBED_TLS +#include +#elif defined(IXWEBSOCKET_USE_OPEN_SSL) #include #endif @@ -65,11 +67,11 @@ namespace ix // TLS #ifdef IXWEBSOCKET_USE_TLS #ifdef IXWEBSOCKET_USE_MBED_TLS - ss << " ssl/mbedtls"; -#elif __APPLE__ - ss << " ssl/DarwinSSL"; + ss << " ssl/mbedtls " << MBEDTLS_VERSION_STRING; #elif defined(IXWEBSOCKET_USE_OPEN_SSL) ss << " ssl/OpenSSL " << OPENSSL_VERSION_TEXT; +#elif __APPLE__ + ss << " ssl/DarwinSSL"; #endif #else ss << " nossl";