jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrected OpenSSL version check. Related to https://github.com/eidheim/Simple-WebSocket-Server/issues/91

Browse source
This commit is contained in:
eidheim 2017-12-11 18:41:30 +01:00
commit 1552cdc11a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crypto.hpp
View file

@ -15,7 +15,7 @@
namespace SimpleWeb {
// TODO 2017: remove workaround for MSVS 2012
#if _MSC_VER == 1700 // MSVS 2012 has no definition for round()
#if _MSC_VER == 1700 // MSVS 2012 has no definition for round()
inline double round(double x) noexcept { // Custom definition of round() for positive numbers
return floor(x + 0.5);
}
@ -68,8 +68,8 @@ namespace SimpleWeb {
b64 = BIO_new(BIO_f_base64());
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
// TODO: Cannot find the exact version this change happended. Remove in 2020
#if OPENSSL_VERSION_NUMBER <= 0x1000114fL
// TODO: Remove in 2020
#if OPENSSL_VERSION_NUMBER <= 0x1000115fL
bio = BIO_new_mem_buf((char *)&base64[0], static_cast<int>(base64.size()));
#else
bio = BIO_new_mem_buf(&base64[0], static_cast<int>(base64.size()));