diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2021-02-04 15:35:52 -0500 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2021-02-04 15:35:52 -0500 |
| commit | 8e46e8d5188210b087dcbca2d9da8f0259959a2e (patch) | |
| tree | 1c318d5cc5d0add441654a3df387dfd568e45c2f | |
| parent | 51805b3f3df6f084b3d7e90b570de4f916c463e1 (diff) | |
| download | sdl_core-feature/ubuntu_20_support.tar.gz | |
Fix issues with SSL version checkingfeature/ubuntu_20_support
| -rw-r--r-- | src/components/security_manager/src/crypto_manager_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/security_manager/src/crypto_manager_impl.cc b/src/components/security_manager/src/crypto_manager_impl.cc index 7a0ec6ac97..7d3b7869f2 100644 --- a/src/components/security_manager/src/crypto_manager_impl.cc +++ b/src/components/security_manager/src/crypto_manager_impl.cc @@ -50,7 +50,7 @@ #include "utils/macro.h" #include "utils/scope_guard.h" -#define OPENSSL1_1_VERSION 0x1010100fL +#define OPENSSL1_1_VERSION 0x1010000fL #define TLS1_1_MINIMAL_VERSION 0x1000103fL #define CONST_SSL_METHOD_MINIMAL_VERSION 0x00909000L @@ -187,7 +187,7 @@ bool CryptoManagerImpl::Init() { SDL_LOG_WARN( "OpenSSL has no TLSv1.1 with version lower 1.0.1, set TLSv1.0"); method = is_server ? TLSv1_server_method() : TLSv1_client_method(); -#elseif OPENSSL_VERSION_NUMBER < OPENSSL1_1_VERSION +#elif OPENSSL_VERSION_NUMBER < OPENSSL1_1_VERSION method = is_server ? TLSv1_1_server_method() : TLSv1_1_client_method(); #else method = is_server ? TLS_server_method() : TLS_client_method(); @@ -199,7 +199,7 @@ bool CryptoManagerImpl::Init() { SDL_LOG_WARN( "OpenSSL has no TLSv1.2 with version lower 1.0.1, set TLSv1.0"); method = is_server ? TLSv1_server_method() : TLSv1_client_method(); -#elseif OPENSSL_VERSION_NUMBER < OPENSSL1_1_VERSION +#elif OPENSSL_VERSION_NUMBER < OPENSSL1_1_VERSION method = is_server ? TLSv1_2_server_method() : TLSv1_2_client_method(); #else method = is_server ? TLS_server_method() : TLS_client_method(); |