From 4bb4e146829e88bb3e9661291e4e2ab50d891ab1 Mon Sep 17 00:00:00 2001 From: Noah Laptop Date: Sun, 24 May 2020 13:46:31 -0700 Subject: [PATCH] fix compilation error on older compilers (https://github.com/OPEnSLab-OSU/SSLClient/issues/12) --- src/SSLClient.cpp | 3 ++- src/SSLClientParameters.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SSLClient.cpp b/src/SSLClient.cpp index 3fa905c..337843f 100644 --- a/src/SSLClient.cpp +++ b/src/SSLClient.cpp @@ -181,7 +181,7 @@ int SSLClient::peek() { /* see SSLClient.h */ void SSLClient::flush() { - if (m_write_idx > 0) + if (m_write_idx > 0) { if(m_run_until(BR_SSL_RECVAPP) < 0) { m_error("Could not flush write buffer!", __func__); int error = br_ssl_engine_last_error(&m_sslctx.eng); @@ -190,6 +190,7 @@ void SSLClient::flush() { if (getWriteError()) m_print_ssl_error(getWriteError(), SSL_ERROR); } + } } /* see SSLClient.h */ diff --git a/src/SSLClientParameters.cpp b/src/SSLClientParameters.cpp index 6407533..1896be3 100644 --- a/src/SSLClientParameters.cpp +++ b/src/SSLClientParameters.cpp @@ -81,7 +81,7 @@ static br_skey_decoder_context make_key_from_der(const std::vector& der) { SSLClientParameters::SSLClientParameters(const char* cert, const size_t cert_len, const char* key, const size_t key_len, bool is_der) : m_cert(is_der ? std::vector(cert, cert + cert_len) : make_vector_pem(cert, cert_len)) , m_cert_struct{ const_cast(reinterpret_cast(m_cert.data())), m_cert.size() } - , m_key_struct{ make_key_from_der( is_der ? std::vector(key, key + key_len) : make_vector_pem(key, key_len) ) } {} + , m_key_struct( make_key_from_der( is_der ? std::vector(key, key + key_len) : make_vector_pem(key, key_len) ) ) {} /* See SSLClientParams.h */ SSLClientParameters SSLClientParameters::fromPEM(const char* cert_pem, const size_t cert_len, const char* key_pem, const size_t key_len) {