diff options
-rw-r--r-- | appveyor.yml | 2 | ||||
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/patches/01-revert_to_openssl_1.0.diff | 604 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | infrastructure/cmake/CMakeLists.txt | 21 | ||||
-rw-r--r-- | infrastructure/cmake/windows/CMakeLists.txt | 18 | ||||
-rw-r--r-- | lib/crypto/CipherBlowfish.cpp | 2 | ||||
-rw-r--r-- | lib/crypto/CipherContext.cpp | 157 | ||||
-rw-r--r-- | lib/crypto/CipherContext.h | 24 | ||||
-rw-r--r-- | lib/crypto/CipherException.txt | 1 | ||||
-rw-r--r-- | lib/server/TLSContext.cpp | 13 | ||||
-rw-r--r-- | test/crypto/testcrypto.cpp | 2 |
13 files changed, 713 insertions, 142 deletions
diff --git a/appveyor.yml b/appveyor.yml index d75eff77..093113f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ configuration: environment: VisualStudioVersion: 11.0 Generator_Base: Visual Studio 11 2012 - OPENSSL_VERSION: 1.1.0f + OPENSSL_VERSION: 1.0.2f PCRE_VERSION: 8.38 CMAKE_UNIBUILD_DIR: '%APPVEYOR_BUILD_FOLDER%\..\cmake' BOXBACKUP_VERSION_BASE: 0.12 diff --git a/debian/changelog b/debian/changelog index ba2f03c7..821428d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +boxbackup (0.13~~git20180102.g6d7e9562-2) unstable; urgency=medium + + * Revert to libssl 1.1 on upstream's request. This will be reverted as + soon as the issues caused by openssl 1.1 are addressed. Until then, + this Reopens: #870775. + + -- Reinhard Tartler <siretart@tauware.de> Wed, 28 Feb 2018 08:31:56 -0500 + boxbackup (0.13~~git20180102.g6d7e9562-1) unstable; urgency=medium [ Andreas Henriksson ] diff --git a/debian/control b/debian/control index 59f211a7..66bc198e 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: docbook-xsl, libdb-dev (>= 4.7), libedit-dev, - libssl-dev, + libssl1.0-dev, libtest-lwp-useragent-perl, xsltproc, zlib1g-dev diff --git a/debian/patches/01-revert_to_openssl_1.0.diff b/debian/patches/01-revert_to_openssl_1.0.diff new file mode 100644 index 00000000..ff90ba0a --- /dev/null +++ b/debian/patches/01-revert_to_openssl_1.0.diff @@ -0,0 +1,604 @@ +commit bc48bec97b65534966da74a07ed3edb3f13f6263 (github/revert_openssl_1_1) +Author: Chris Wilson <chris+github@qwirx.com> +Date: Sun Feb 25 08:18:34 2018 +0000 + + Revert "Add support for OpenSSL 1.1 and replace deprecated function calls" + + Until shown to be safe. See message from Johann Glaser to the mailing list. + + This reverts commit 85e7efc3fa0477f60318d2cd2144503a9ea8feb9. + +diff --git a/appveyor.yml b/appveyor.yml +index d75eff77..093113f7 100644 +--- a/appveyor.yml ++++ b/appveyor.yml +@@ -18,7 +18,7 @@ configuration: + environment: + VisualStudioVersion: 11.0 + Generator_Base: Visual Studio 11 2012 +- OPENSSL_VERSION: 1.1.0f ++ OPENSSL_VERSION: 1.0.2f + PCRE_VERSION: 8.38 + CMAKE_UNIBUILD_DIR: '%APPVEYOR_BUILD_FOLDER%\..\cmake' + BOXBACKUP_VERSION_BASE: 0.12 +diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt +index 65f59eb8..25015452 100644 +--- a/infrastructure/cmake/CMakeLists.txt ++++ b/infrastructure/cmake/CMakeLists.txt +@@ -407,26 +407,7 @@ else() + endif() + + # Link to OpenSSL +-# Workaround for incorrect library suffixes searched by FindOpenSSL: +-# https://gitlab.kitware.com/cmake/cmake/issues/17604 +-if(WIN32 AND MSVC) +- find_package(OpenSSL) +- set(OPENSSL_SSL_LIBRARY ${SSL_EAY_RELEASE}) +- set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_RELEASE}) +- set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} crypt32) +- find_package_handle_standard_args(OpenSSL +- REQUIRED_VARS +- OPENSSL_SSL_LIBRARY +- OPENSSL_CRYPTO_LIBRARY +- OPENSSL_INCLUDE_DIR +- VERSION_VAR +- OPENSSL_VERSION +- FAIL_MESSAGE +- "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR" +- ) +-else() +- find_package(OpenSSL REQUIRED) +-endif() ++find_package(OpenSSL REQUIRED) + include_directories(${OPENSSL_INCLUDE_DIR}) + target_link_libraries(lib_crypto PUBLIC ${OPENSSL_LIBRARIES}) + +diff --git a/infrastructure/cmake/windows/CMakeLists.txt b/infrastructure/cmake/windows/CMakeLists.txt +index 49a1ea4d..0fbe35e3 100644 +--- a/infrastructure/cmake/windows/CMakeLists.txt ++++ b/infrastructure/cmake/windows/CMakeLists.txt +@@ -15,9 +15,9 @@ set(ZLIB_VERSION 1.2.11) + set(ZLIB_HASH SHA256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1) + + # Version of OpenSSL to download, build, and compile Box Backup against: +-set(OPENSSL_VERSION 1.1.0g) ++set(OPENSSL_VERSION 1.0.2j) + # Hash of openssl-${OPENSSL_VERSION}.tar.gz, to be verified after download: +-set(OPENSSL_HASH SHA256=de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af) ++set(OPENSSL_HASH SHA256=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431) + + # Version of PCRE to download, build, and compile Box Backup against: + set(PCRE_VERSION 8.39) +@@ -49,21 +49,15 @@ if(WIN32) + URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" + URL_HASH ${OPENSSL_HASH} + DOWNLOAD_NO_PROGRESS 1 +- CONFIGURE_COMMAND perl Configure debug-VC-WIN32 no-asm no-shared +- --prefix=${install_dir} +- --openssldir=etc +- # Run tests before install, but don't make the main target depend on them, so that +- # we don't have to run them whenever we build manually on Windows. +- TEST_BEFORE_INSTALL 1 +- TEST_EXCLUDE_FROM_MAIN 1 ++ CONFIGURE_COMMAND perl Configure debug-VC-WIN32 no-asm --prefix=${install_dir} ++ COMMAND cmd /c ms\\do_ms.bat + # You would expect us to use nt.mak to compile a static library here, but mk1mf.pl uses the /MT[d] + # CRT in that case, which is incompatible with our dynamic runtime, /MD[d]. It seems that the libs + # built by ntdll.mak, which are compiled with /MD[d], are full libraries and not import libs, + # so we can link statically against them and still get a dynamic runtime. + BUILD_IN_SOURCE 1 +- BUILD_COMMAND nmake /s +- TEST_COMMAND nmake /s test +- INSTALL_COMMAND nmake /s install ++ BUILD_COMMAND nmake /s /f ms\\nt.mak ++ INSTALL_COMMAND nmake /s /f ms\\nt.mak install + ) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + ExternalProject_Add(openssl +diff --git a/lib/crypto/CipherBlowfish.cpp b/lib/crypto/CipherBlowfish.cpp +index 4c75b1de..e16cc6ed 100644 +--- a/lib/crypto/CipherBlowfish.cpp ++++ b/lib/crypto/CipherBlowfish.cpp +@@ -206,7 +206,7 @@ void CipherBlowfish::SetupParameters(EVP_CIPHER_CTX *pCipherContext) const + } + // Set key + #ifndef HAVE_OLD_SSL +- if(EVP_CipherInit_ex(pCipherContext, GetCipher(), NULL, (unsigned char*)mpKey, (unsigned char*)mpInitialisationVector, -1) != 1) ++ if(EVP_CipherInit_ex(pCipherContext, NULL, NULL, (unsigned char*)mpKey, (unsigned char*)mpInitialisationVector, -1) != 1) + #else + if(EVP_CipherInit(pCipherContext, NULL, (unsigned char*)mKey.c_str(), (unsigned char*)mInitialisationVector, -1) != 1) + #endif +diff --git a/lib/crypto/CipherContext.cpp b/lib/crypto/CipherContext.cpp +index 3de88c64..fd149395 100644 +--- a/lib/crypto/CipherContext.cpp ++++ b/lib/crypto/CipherContext.cpp +@@ -2,7 +2,7 @@ + // + // File + // Name: CipherContext.cpp +-// Purpose: Context for symmetric encryption / decryption ++// Purpose: Context for symmetric encryption / descryption + // Created: 1/12/03 + // + // -------------------------------------------------------------------------- +@@ -50,7 +50,7 @@ CipherContext::~CipherContext() + if(mInitialised) + { + // Clean up +- BOX_OPENSSL_CLEANUP_CTX(ctx); ++ EVP_CIPHER_CTX_cleanup(&ctx); + mInitialised = false; + } + #ifdef HAVE_OLD_SSL +@@ -98,7 +98,7 @@ void CipherContext::Init(CipherContext::CipherFunction Function, const CipherDes + // Check for bad usage + if(mInitialised) + { +- THROW_EXCEPTION(CipherException, AlreadyInitialised); ++ THROW_EXCEPTION(CipherException, AlreadyInitialised) + } + if(Function != Decrypt && Function != Encrypt) + { +@@ -109,45 +109,43 @@ void CipherContext::Init(CipherContext::CipherFunction Function, const CipherDes + mFunction = Function; + + // Initialise the cipher +-#ifdef HAVE_OLD_SSL +- // Use old version of init call +- if(EVP_CipherInit(&ctx, rDescription.GetCipher(), NULL, NULL, ++#ifndef HAVE_OLD_SSL ++ EVP_CIPHER_CTX_init(&ctx); // no error return code, even though the docs says it does ++ ++ if(EVP_CipherInit_ex(&ctx, rDescription.GetCipher(), NULL, NULL, NULL, + (mFunction == Encrypt) ? 1 : 0) != 1) + #else +- BOX_OPENSSL_INIT_CTX(ctx); +- +- // Don't set key or IV yet, because we will modify the parameters: +- if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), rDescription.GetCipher(), NULL, NULL, NULL, ++ // Use old version of init call ++ if(EVP_CipherInit(&ctx, rDescription.GetCipher(), NULL, NULL, + (mFunction == Encrypt) ? 1 : 0) != 1) + #endif + { + THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, + "Failed to initialise " << rDescription.GetFullName() +- << ": " << LogError("initialising cipher")); ++ << "cipher: " << LogError("initialising cipher")); + } +- UsePadding(mPaddingOn); + + try + { + mCipherName = rDescription.GetFullName(); + #ifndef HAVE_OLD_SSL + // Let the description set up everything else +- mpDescription = &rDescription; ++ rDescription.SetupParameters(&ctx); + #else + // With the old version, a copy needs to be taken first. + mpDescription = rDescription.Clone(); + // Mark it as not a leak, otherwise static cipher contexts + // cause spurious memory leaks to be reported + MEMLEAKFINDER_NOT_A_LEAK(mpDescription); ++ mpDescription->SetupParameters(&ctx); + #endif +- mpDescription->SetupParameters(BOX_OPENSSL_CTX(ctx)); + } + catch(...) + { + THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, +- "Failed to configure " << mCipherName << ": " << ++ "Failed to configure " << mCipherName << " cipher: " << + LogError("configuring cipher")); +- BOX_OPENSSL_CLEANUP_CTX(ctx); ++ EVP_CIPHER_CTX_cleanup(&ctx); + throw; + } + +@@ -168,7 +166,7 @@ void CipherContext::Reset() + if(mInitialised) + { + // Clean up +- EVP_CIPHER_CTX_cleanup(BOX_OPENSSL_CTX(ctx)); ++ EVP_CIPHER_CTX_cleanup(&ctx); + mInitialised = false; + } + #ifdef HAVE_OLD_SSL +@@ -179,7 +177,6 @@ void CipherContext::Reset() + } + #endif + mWithinTransform = false; +- mIV.clear(); + } + + +@@ -195,22 +192,24 @@ void CipherContext::Begin() + { + if(!mInitialised) + { +- THROW_EXCEPTION(CipherException, NotInitialised); ++ THROW_EXCEPTION(CipherException, NotInitialised) + } + ++ // Warn if in a transformation (not an error, because a context might not have been finalised if an exception occured) + if(mWithinTransform) + { +- THROW_EXCEPTION(CipherException, AlreadyInTransform); ++ BOX_WARNING("CipherContext::Begin called when context " ++ "flagged as within a transform"); + } + +- if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), NULL, NULL, NULL, +- (const unsigned char *)(mIV.size() > 0 ? mIV.c_str() : NULL), +- -1) != 1) ++ // Initialise the cipher context again ++ if(EVP_CipherInit(&ctx, NULL, NULL, NULL, -1) != 1) + { + THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, +- "Failed to set IV for " << mCipherName << ": " << LogError(GetFunction())); ++ "Failed to reset " << mCipherName << " cipher: " << ++ LogError("resetting cipher")); + } +- ++ + // Mark as being within a transform + mWithinTransform = true; + } +@@ -252,18 +251,18 @@ int CipherContext::Transform(void *pOutBuffer, int OutLength, const void *pInBuf + } + + // Check output buffer size +- if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) ++ if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(&ctx))) + { + THROW_EXCEPTION(CipherException, OutputBufferTooSmall); + } + + // Do the transform + int outLength = OutLength; +- if(EVP_CipherUpdate(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &outLength, +- (unsigned char*)pInBuffer, InLength) != 1) ++ if(EVP_CipherUpdate(&ctx, (unsigned char*)pOutBuffer, &outLength, (unsigned char*)pInBuffer, InLength) != 1) + { + THROW_EXCEPTION_MESSAGE(CipherException, EVPUpdateFailure, +- "Failed to update " << mCipherName << ": " << LogError(GetFunction())); ++ "Failed to " << GetFunction() << " (update) " << ++ mCipherName << " cipher: " << LogError(GetFunction())); + } + + return outLength; +@@ -301,7 +300,7 @@ int CipherContext::Final(void *pOutBuffer, int OutLength) + } + + // Check output buffer size +- if(OutLength < (2 * EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) ++ if(OutLength < (2 * EVP_CIPHER_CTX_block_size(&ctx))) + { + THROW_EXCEPTION(CipherException, OutputBufferTooSmall); + } +@@ -309,11 +308,12 @@ int CipherContext::Final(void *pOutBuffer, int OutLength) + // Do the transform + int outLength = OutLength; + #ifndef HAVE_OLD_SSL +- if(EVP_CipherFinal(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &outLength) != 1) ++ if(EVP_CipherFinal(&ctx, (unsigned char*)pOutBuffer, &outLength) != 1) + { + mWithinTransform = false; + THROW_EXCEPTION_MESSAGE(CipherException, EVPFinalFailure, +- "Failed to finalise " << mCipherName << ": " << LogError(GetFunction())); ++ "Failed to " << GetFunction() << " (final) " << ++ mCipherName << " cipher: " << LogError(GetFunction())); + } + #else + OldOpenSSLFinal((unsigned char*)pOutBuffer, outLength); +@@ -340,11 +340,11 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) + // Old version needs to use a different form, and then set up the cipher again for next time around + int outLength = rOutLengthOut; + // Have to emulate padding off... +- int blockSize = EVP_CIPHER_CTX_block_size(ctx); ++ int blockSize = EVP_CIPHER_CTX_block_size(&ctx); + if(mPaddingOn) + { + // Just use normal final call +- if(EVP_CipherFinal(ctx, Buffer, &outLength) != 1) ++ if(EVP_CipherFinal(&ctx, Buffer, &outLength) != 1) + { + THROW_EXCEPTION(CipherException, EVPFinalFailure) + } +@@ -357,13 +357,13 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) + { + // NASTY -- fiddling around with internals like this is bad. + // But only way to get this working on old versions of OpenSSL. +- if(!EVP_EncryptUpdate(ctx,Buffer,&outLength,ctx.buf,0) ++ if(!EVP_EncryptUpdate(&ctx,Buffer,&outLength,ctx.buf,0) + || outLength != blockSize) + { + THROW_EXCEPTION(CipherException, EVPFinalFailure) + } + // Clean up +- EVP_CIPHER_CTX_free(ctx); ++ EVP_CIPHER_CTX_cleanup(&ctx); + } + else + { +@@ -391,14 +391,12 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) + } + } + // Reinitialise the cipher for the next time around +- if(EVP_CipherInit_ex(&ctx, mpDescription->GetCipher(), NULL, NULL, +- (const unsigned char *)(mIV.size() > 0 ? mIV.c_str() : NULL), ++ if(EVP_CipherInit(&ctx, mpDescription->GetCipher(), NULL, NULL, + (mFunction == Encrypt) ? 1 : 0) != 1) + { + THROW_EXCEPTION(CipherException, EVPInitFailure) + } + mpDescription->SetupParameters(&ctx); +- UsePadding(mPaddingOn); + + // Update length for caller + rOutLengthOut = outLength; +@@ -423,7 +421,7 @@ int CipherContext::InSizeForOutBufferSize(int OutLength) + + // Strictly speaking, the *2 is unnecessary. However... + // Final() is paranoid, and requires two input blocks of space to work. +- return OutLength - (EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)) * 2); ++ return OutLength - (EVP_CIPHER_CTX_block_size(&ctx) * 2); + } + + // -------------------------------------------------------------------------- +@@ -444,7 +442,7 @@ int CipherContext::MaxOutSizeForInBufferSize(int InLength) + + // Final() is paranoid, and requires two input blocks of space to work, and so we need to add + // three blocks on to be absolutely sure. +- return InLength + (EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)) * 3); ++ return InLength + (EVP_CIPHER_CTX_block_size(&ctx) * 3); + } + + +@@ -458,8 +456,20 @@ int CipherContext::MaxOutSizeForInBufferSize(int InLength) + // -------------------------------------------------------------------------- + int CipherContext::TransformBlock(void *pOutBuffer, int OutLength, const void *pInBuffer, int InLength) + { ++ if(!mInitialised) ++ { ++ THROW_EXCEPTION(CipherException, NotInitialised) ++ } ++ ++ // Warn if in a transformation ++ if(mWithinTransform) ++ { ++ BOX_WARNING("CipherContext::TransformBlock called when " ++ "context flagged as within a transform"); ++ } ++ + // Check output buffer size +- if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) ++ if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(&ctx))) + { + // Check if padding is off, in which case the buffer can be smaller + if(!mPaddingOn && OutLength <= InLength) +@@ -471,36 +481,40 @@ int CipherContext::TransformBlock(void *pOutBuffer, int OutLength, const void *p + THROW_EXCEPTION(CipherException, OutputBufferTooSmall); + } + } +- +- Begin(); ++ ++ // Initialise the cipher context again ++ if(EVP_CipherInit(&ctx, NULL, NULL, NULL, -1) != 1) ++ { ++ THROW_EXCEPTION(CipherException, EVPInitFailure) ++ } + + // Do the entire block +- int output_space_used = OutLength; ++ int outLength = 0; + + // Update +- if(EVP_CipherUpdate(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &output_space_used, +- (unsigned char*)pInBuffer, InLength) != 1) ++ outLength = OutLength; ++ if(EVP_CipherUpdate(&ctx, (unsigned char*)pOutBuffer, &outLength, (unsigned char*)pInBuffer, InLength) != 1) + { + THROW_EXCEPTION_MESSAGE(CipherException, EVPUpdateFailure, +- "Failed to update " << mCipherName << ": " << LogError(GetFunction())); ++ "Failed to " << GetFunction() << " (update) " << ++ mCipherName << " cipher: " << LogError(GetFunction())); + } + + // Finalise +- int output_space_remain = OutLength - output_space_used; +- +-#ifdef HAVE_OLD_SSL +- OldOpenSSLFinal(((unsigned char*)pOutBuffer) + output_space_used, output_space_remain); +-#else +- if(EVP_CipherFinal(BOX_OPENSSL_CTX(ctx), ((unsigned char*)pOutBuffer) + output_space_used, +- &output_space_remain) != 1) ++ int outLength2 = OutLength - outLength; ++#ifndef HAVE_OLD_SSL ++ if(EVP_CipherFinal(&ctx, ((unsigned char*)pOutBuffer) + outLength, &outLength2) != 1) + { + THROW_EXCEPTION_MESSAGE(CipherException, EVPFinalFailure, +- "Failed to finalise " << mCipherName << ": " << LogError(GetFunction())); ++ "Failed to " << GetFunction() << " (final) " << ++ mCipherName << " cipher: " << LogError(GetFunction())); + } ++#else ++ OldOpenSSLFinal(((unsigned char*)pOutBuffer) + outLength, outLength2); + #endif ++ outLength += outLength2; + +- mWithinTransform = false; +- return output_space_used + output_space_remain; ++ return outLength; + } + + +@@ -519,7 +533,7 @@ int CipherContext::GetIVLength() + THROW_EXCEPTION(CipherException, NotInitialised) + } + +- return EVP_CIPHER_CTX_iv_length(BOX_OPENSSL_CTX(ctx)); ++ return EVP_CIPHER_CTX_iv_length(&ctx); + } + + +@@ -545,14 +559,12 @@ void CipherContext::SetIV(const void *pIV) + "flagged as within a transform"); + } + +- mIV = std::string((const char *)pIV, GetIVLength()); +- + // Set IV +- if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), NULL, NULL, NULL, +- (const unsigned char *)mIV.c_str(), -1) != 1) ++ if(EVP_CipherInit(&ctx, NULL, NULL, (unsigned char *)pIV, -1) != 1) + { + THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, +- "Failed to set IV for " << mCipherName << ": " << LogError(GetFunction())); ++ "Failed to " << GetFunction() << " (set IV) " << ++ mCipherName << " cipher: " << LogError(GetFunction())); + } + + #ifdef HAVE_OLD_SSL +@@ -589,20 +601,19 @@ const void *CipherContext::SetRandomIV(int &rLengthOut) + } + + // Get length of IV +- uint8_t generated_iv[CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH]; +- unsigned int ivLen = EVP_CIPHER_CTX_iv_length(BOX_OPENSSL_CTX(ctx)); +- if(ivLen > sizeof(generated_iv)) ++ unsigned int ivLen = EVP_CIPHER_CTX_iv_length(&ctx); ++ if(ivLen > sizeof(mGeneratedIV)) + { + THROW_EXCEPTION(CipherException, IVSizeImplementationLimitExceeded) + } + + // Generate some random data +- Random::Generate(generated_iv, ivLen); +- SetIV(generated_iv); ++ Random::Generate(mGeneratedIV, ivLen); ++ SetIV(mGeneratedIV); + + // Return the IV and it's length + rLengthOut = ivLen; +- return mIV.c_str(); ++ return mGeneratedIV; + } + + +@@ -617,11 +628,9 @@ const void *CipherContext::SetRandomIV(int &rLengthOut) + void CipherContext::UsePadding(bool Padding) + { + #ifndef HAVE_OLD_SSL +- if(EVP_CIPHER_CTX_set_padding(BOX_OPENSSL_CTX(ctx), Padding) != 1) ++ if(EVP_CIPHER_CTX_set_padding(&ctx, Padding) != 1) + { +- THROW_EXCEPTION_MESSAGE(CipherException, EVPSetPaddingFailure, +- "Failed to set padding for " << mCipherName << ": " << +- LogError(GetFunction())); ++ THROW_EXCEPTION(CipherException, EVPSetPaddingFailure) + } + #endif + mPaddingOn = Padding; +diff --git a/lib/crypto/CipherContext.h b/lib/crypto/CipherContext.h +index b6e97b4e..93c889d6 100644 +--- a/lib/crypto/CipherContext.h ++++ b/lib/crypto/CipherContext.h +@@ -19,22 +19,6 @@ class CipherDescription; + + #define CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH 32 + +-// Macros to allow compatibility with OpenSSL 1.0 and 1.1 APIs. See +-// https://github.com/charybdis-ircd/charybdis/blob/release/3.5/libratbox/src/openssl_ratbox.h +-// for the gory details. +-#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER >= 0x10100000L) // OpenSSL >= 1.1 +-# define BOX_OPENSSL_INIT_CTX(ctx) ctx = EVP_CIPHER_CTX_new(); +-# define BOX_OPENSSL_CTX(ctx) ctx +-# define BOX_OPENSSL_CLEANUP_CTX(ctx) EVP_CIPHER_CTX_free(ctx) +-typedef EVP_CIPHER_CTX* BOX_EVP_CIPHER_CTX; +-#else // OpenSSL < 1.1 +-# define BOX_OPENSSL_INIT_CTX(ctx) EVP_CIPHER_CTX_init(&ctx); // no error return code, even though the docs says it does +-# define BOX_OPENSSL_CTX(ctx) &ctx +-# define BOX_OPENSSL_CLEANUP_CTX(ctx) EVP_CIPHER_CTX_cleanup(&ctx) +-typedef EVP_CIPHER_CTX BOX_EVP_CIPHER_CTX; +-#endif +- +- + // -------------------------------------------------------------------------- + // + // Class +@@ -90,14 +74,16 @@ public: + #endif + + private: +- BOX_EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX ctx; + bool mInitialised; + bool mWithinTransform; + bool mPaddingOn; ++ uint8_t mGeneratedIV[CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH]; + CipherFunction mFunction; + std::string mCipherName; +- const CipherDescription *mpDescription; +- std::string mIV; ++#ifdef HAVE_OLD_SSL ++ CipherDescription *mpDescription; ++#endif + }; + + +diff --git a/lib/crypto/CipherException.txt b/lib/crypto/CipherException.txt +index 494ed3cc..abdbac87 100644 +--- a/lib/crypto/CipherException.txt ++++ b/lib/crypto/CipherException.txt +@@ -16,4 +16,3 @@ PseudoRandNotAvailable 12 + EVPSetPaddingFailure 13 + RandomInitFailed 14 Failed to read from random device + LengthRequestedTooLongForRandomHex 15 +-AlreadyInTransform 16 Tried to initialise crypto when already in a transform +diff --git a/lib/server/TLSContext.cpp b/lib/server/TLSContext.cpp +index 1a6d4a53..35e254fd 100644 +--- a/lib/server/TLSContext.cpp ++++ b/lib/server/TLSContext.cpp +@@ -23,17 +23,6 @@ + #define MAX_VERIFICATION_DEPTH 2 + #define CIPHER_LIST "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" + +-// Macros to allow compatibility with OpenSSL 1.0 and 1.1 APIs. See +-// https://github.com/charybdis-ircd/charybdis/blob/release/3.5/libratbox/src/openssl_ratbox.h +-// for the gory details. +-#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER >= 0x10100000L) // OpenSSL >= 1.1 +-# define BOX_TLS_SERVER_METHOD TLS_server_method +-# define BOX_TLS_CLIENT_METHOD TLS_client_method +-#else // OpenSSL < 1.1 +-# define BOX_TLS_SERVER_METHOD TLSv1_server_method +-# define BOX_TLS_CLIENT_METHOD TLSv1_client_method +-#endif +- + // -------------------------------------------------------------------------- + // + // Function +@@ -78,7 +67,7 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c + ::SSL_CTX_free(mpContext); + } + +- mpContext = ::SSL_CTX_new(AsServer ? BOX_TLS_SERVER_METHOD() : BOX_TLS_CLIENT_METHOD()); ++ mpContext = ::SSL_CTX_new(AsServer?TLSv1_server_method():TLSv1_client_method()); + if(mpContext == NULL) + { + THROW_EXCEPTION(ServerException, TLSAllocationFailed) +diff --git a/test/crypto/testcrypto.cpp b/test/crypto/testcrypto.cpp +index 32d2efb8..4e623cc2 100644 +--- a/test/crypto/testcrypto.cpp ++++ b/test/crypto/testcrypto.cpp +@@ -266,7 +266,7 @@ int test(int argc, const char *argv[]) + // Check rolling checksums + uint8_t *checkdata_blk = (uint8_t *)malloc(CHECKSUM_DATA_SIZE); + uint8_t *checkdata = checkdata_blk; +- RAND_bytes(checkdata, CHECKSUM_DATA_SIZE); ++ RAND_pseudo_bytes(checkdata, CHECKSUM_DATA_SIZE); + for(int size = CHECKSUM_BLOCK_SIZE_BASE; size <= CHECKSUM_BLOCK_SIZE_LAST; ++size) + { + // Test skip-roll code diff --git a/debian/patches/series b/debian/patches/series index f52e7b08..dd9b249c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +01-revert_to_openssl_1.0.diff 03-adjust-syslog-facility.diff 05-dont_use_net_for_docs.diff diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 65f59eb8..25015452 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -407,26 +407,7 @@ else() endif() # Link to OpenSSL -# Workaround for incorrect library suffixes searched by FindOpenSSL: -# https://gitlab.kitware.com/cmake/cmake/issues/17604 -if(WIN32 AND MSVC) - find_package(OpenSSL) - set(OPENSSL_SSL_LIBRARY ${SSL_EAY_RELEASE}) - set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_RELEASE}) - set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} crypt32) - find_package_handle_standard_args(OpenSSL - REQUIRED_VARS - OPENSSL_SSL_LIBRARY - OPENSSL_CRYPTO_LIBRARY - OPENSSL_INCLUDE_DIR - VERSION_VAR - OPENSSL_VERSION - FAIL_MESSAGE - "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR" - ) -else() - find_package(OpenSSL REQUIRED) -endif() +find_package(OpenSSL REQUIRED) include_directories(${OPENSSL_INCLUDE_DIR}) target_link_libraries(lib_crypto PUBLIC ${OPENSSL_LIBRARIES}) diff --git a/infrastructure/cmake/windows/CMakeLists.txt b/infrastructure/cmake/windows/CMakeLists.txt index 49a1ea4d..0fbe35e3 100644 --- a/infrastructure/cmake/windows/CMakeLists.txt +++ b/infrastructure/cmake/windows/CMakeLists.txt @@ -15,9 +15,9 @@ set(ZLIB_VERSION 1.2.11) set(ZLIB_HASH SHA256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1) # Version of OpenSSL to download, build, and compile Box Backup against: -set(OPENSSL_VERSION 1.1.0g) +set(OPENSSL_VERSION 1.0.2j) # Hash of openssl-${OPENSSL_VERSION}.tar.gz, to be verified after download: -set(OPENSSL_HASH SHA256=de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af) +set(OPENSSL_HASH SHA256=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431) # Version of PCRE to download, build, and compile Box Backup against: set(PCRE_VERSION 8.39) @@ -49,21 +49,15 @@ if(WIN32) URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" URL_HASH ${OPENSSL_HASH} DOWNLOAD_NO_PROGRESS 1 - CONFIGURE_COMMAND perl Configure debug-VC-WIN32 no-asm no-shared - --prefix=${install_dir} - --openssldir=etc - # Run tests before install, but don't make the main target depend on them, so that - # we don't have to run them whenever we build manually on Windows. - TEST_BEFORE_INSTALL 1 - TEST_EXCLUDE_FROM_MAIN 1 + CONFIGURE_COMMAND perl Configure debug-VC-WIN32 no-asm --prefix=${install_dir} + COMMAND cmd /c ms\\do_ms.bat # You would expect us to use nt.mak to compile a static library here, but mk1mf.pl uses the /MT[d] # CRT in that case, which is incompatible with our dynamic runtime, /MD[d]. It seems that the libs # built by ntdll.mak, which are compiled with /MD[d], are full libraries and not import libs, # so we can link statically against them and still get a dynamic runtime. BUILD_IN_SOURCE 1 - BUILD_COMMAND nmake /s - TEST_COMMAND nmake /s test - INSTALL_COMMAND nmake /s install + BUILD_COMMAND nmake /s /f ms\\nt.mak + INSTALL_COMMAND nmake /s /f ms\\nt.mak install ) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ExternalProject_Add(openssl diff --git a/lib/crypto/CipherBlowfish.cpp b/lib/crypto/CipherBlowfish.cpp index 4c75b1de..e16cc6ed 100644 --- a/lib/crypto/CipherBlowfish.cpp +++ b/lib/crypto/CipherBlowfish.cpp @@ -206,7 +206,7 @@ void CipherBlowfish::SetupParameters(EVP_CIPHER_CTX *pCipherContext) const } // Set key #ifndef HAVE_OLD_SSL - if(EVP_CipherInit_ex(pCipherContext, GetCipher(), NULL, (unsigned char*)mpKey, (unsigned char*)mpInitialisationVector, -1) != 1) + if(EVP_CipherInit_ex(pCipherContext, NULL, NULL, (unsigned char*)mpKey, (unsigned char*)mpInitialisationVector, -1) != 1) #else if(EVP_CipherInit(pCipherContext, NULL, (unsigned char*)mKey.c_str(), (unsigned char*)mInitialisationVector, -1) != 1) #endif diff --git a/lib/crypto/CipherContext.cpp b/lib/crypto/CipherContext.cpp index 3de88c64..fd149395 100644 --- a/lib/crypto/CipherContext.cpp +++ b/lib/crypto/CipherContext.cpp @@ -2,7 +2,7 @@ // // File // Name: CipherContext.cpp -// Purpose: Context for symmetric encryption / decryption +// Purpose: Context for symmetric encryption / descryption // Created: 1/12/03 // // -------------------------------------------------------------------------- @@ -50,7 +50,7 @@ CipherContext::~CipherContext() if(mInitialised) { // Clean up - BOX_OPENSSL_CLEANUP_CTX(ctx); + EVP_CIPHER_CTX_cleanup(&ctx); mInitialised = false; } #ifdef HAVE_OLD_SSL @@ -98,7 +98,7 @@ void CipherContext::Init(CipherContext::CipherFunction Function, const CipherDes // Check for bad usage if(mInitialised) { - THROW_EXCEPTION(CipherException, AlreadyInitialised); + THROW_EXCEPTION(CipherException, AlreadyInitialised) } if(Function != Decrypt && Function != Encrypt) { @@ -109,45 +109,43 @@ void CipherContext::Init(CipherContext::CipherFunction Function, const CipherDes mFunction = Function; // Initialise the cipher -#ifdef HAVE_OLD_SSL - // Use old version of init call - if(EVP_CipherInit(&ctx, rDescription.GetCipher(), NULL, NULL, +#ifndef HAVE_OLD_SSL + EVP_CIPHER_CTX_init(&ctx); // no error return code, even though the docs says it does + + if(EVP_CipherInit_ex(&ctx, rDescription.GetCipher(), NULL, NULL, NULL, (mFunction == Encrypt) ? 1 : 0) != 1) #else - BOX_OPENSSL_INIT_CTX(ctx); - - // Don't set key or IV yet, because we will modify the parameters: - if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), rDescription.GetCipher(), NULL, NULL, NULL, + // Use old version of init call + if(EVP_CipherInit(&ctx, rDescription.GetCipher(), NULL, NULL, (mFunction == Encrypt) ? 1 : 0) != 1) #endif { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, "Failed to initialise " << rDescription.GetFullName() - << ": " << LogError("initialising cipher")); + << "cipher: " << LogError("initialising cipher")); } - UsePadding(mPaddingOn); try { mCipherName = rDescription.GetFullName(); #ifndef HAVE_OLD_SSL // Let the description set up everything else - mpDescription = &rDescription; + rDescription.SetupParameters(&ctx); #else // With the old version, a copy needs to be taken first. mpDescription = rDescription.Clone(); // Mark it as not a leak, otherwise static cipher contexts // cause spurious memory leaks to be reported MEMLEAKFINDER_NOT_A_LEAK(mpDescription); + mpDescription->SetupParameters(&ctx); #endif - mpDescription->SetupParameters(BOX_OPENSSL_CTX(ctx)); } catch(...) { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, - "Failed to configure " << mCipherName << ": " << + "Failed to configure " << mCipherName << " cipher: " << LogError("configuring cipher")); - BOX_OPENSSL_CLEANUP_CTX(ctx); + EVP_CIPHER_CTX_cleanup(&ctx); throw; } @@ -168,7 +166,7 @@ void CipherContext::Reset() if(mInitialised) { // Clean up - EVP_CIPHER_CTX_cleanup(BOX_OPENSSL_CTX(ctx)); + EVP_CIPHER_CTX_cleanup(&ctx); mInitialised = false; } #ifdef HAVE_OLD_SSL @@ -179,7 +177,6 @@ void CipherContext::Reset() } #endif mWithinTransform = false; - mIV.clear(); } @@ -195,22 +192,24 @@ void CipherContext::Begin() { if(!mInitialised) { - THROW_EXCEPTION(CipherException, NotInitialised); + THROW_EXCEPTION(CipherException, NotInitialised) } + // Warn if in a transformation (not an error, because a context might not have been finalised if an exception occured) if(mWithinTransform) { - THROW_EXCEPTION(CipherException, AlreadyInTransform); + BOX_WARNING("CipherContext::Begin called when context " + "flagged as within a transform"); } - if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), NULL, NULL, NULL, - (const unsigned char *)(mIV.size() > 0 ? mIV.c_str() : NULL), - -1) != 1) + // Initialise the cipher context again + if(EVP_CipherInit(&ctx, NULL, NULL, NULL, -1) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, - "Failed to set IV for " << mCipherName << ": " << LogError(GetFunction())); + "Failed to reset " << mCipherName << " cipher: " << + LogError("resetting cipher")); } - + // Mark as being within a transform mWithinTransform = true; } @@ -252,18 +251,18 @@ int CipherContext::Transform(void *pOutBuffer, int OutLength, const void *pInBuf } // Check output buffer size - if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) + if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(&ctx))) { THROW_EXCEPTION(CipherException, OutputBufferTooSmall); } // Do the transform int outLength = OutLength; - if(EVP_CipherUpdate(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &outLength, - (unsigned char*)pInBuffer, InLength) != 1) + if(EVP_CipherUpdate(&ctx, (unsigned char*)pOutBuffer, &outLength, (unsigned char*)pInBuffer, InLength) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPUpdateFailure, - "Failed to update " << mCipherName << ": " << LogError(GetFunction())); + "Failed to " << GetFunction() << " (update) " << + mCipherName << " cipher: " << LogError(GetFunction())); } return outLength; @@ -301,7 +300,7 @@ int CipherContext::Final(void *pOutBuffer, int OutLength) } // Check output buffer size - if(OutLength < (2 * EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) + if(OutLength < (2 * EVP_CIPHER_CTX_block_size(&ctx))) { THROW_EXCEPTION(CipherException, OutputBufferTooSmall); } @@ -309,11 +308,12 @@ int CipherContext::Final(void *pOutBuffer, int OutLength) // Do the transform int outLength = OutLength; #ifndef HAVE_OLD_SSL - if(EVP_CipherFinal(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &outLength) != 1) + if(EVP_CipherFinal(&ctx, (unsigned char*)pOutBuffer, &outLength) != 1) { mWithinTransform = false; THROW_EXCEPTION_MESSAGE(CipherException, EVPFinalFailure, - "Failed to finalise " << mCipherName << ": " << LogError(GetFunction())); + "Failed to " << GetFunction() << " (final) " << + mCipherName << " cipher: " << LogError(GetFunction())); } #else OldOpenSSLFinal((unsigned char*)pOutBuffer, outLength); @@ -340,11 +340,11 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) // Old version needs to use a different form, and then set up the cipher again for next time around int outLength = rOutLengthOut; // Have to emulate padding off... - int blockSize = EVP_CIPHER_CTX_block_size(ctx); + int blockSize = EVP_CIPHER_CTX_block_size(&ctx); if(mPaddingOn) { // Just use normal final call - if(EVP_CipherFinal(ctx, Buffer, &outLength) != 1) + if(EVP_CipherFinal(&ctx, Buffer, &outLength) != 1) { THROW_EXCEPTION(CipherException, EVPFinalFailure) } @@ -357,13 +357,13 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) { // NASTY -- fiddling around with internals like this is bad. // But only way to get this working on old versions of OpenSSL. - if(!EVP_EncryptUpdate(ctx,Buffer,&outLength,ctx.buf,0) + if(!EVP_EncryptUpdate(&ctx,Buffer,&outLength,ctx.buf,0) || outLength != blockSize) { THROW_EXCEPTION(CipherException, EVPFinalFailure) } // Clean up - EVP_CIPHER_CTX_free(ctx); + EVP_CIPHER_CTX_cleanup(&ctx); } else { @@ -391,14 +391,12 @@ void CipherContext::OldOpenSSLFinal(unsigned char *Buffer, int &rOutLengthOut) } } // Reinitialise the cipher for the next time around - if(EVP_CipherInit_ex(&ctx, mpDescription->GetCipher(), NULL, NULL, - (const unsigned char *)(mIV.size() > 0 ? mIV.c_str() : NULL), + if(EVP_CipherInit(&ctx, mpDescription->GetCipher(), NULL, NULL, (mFunction == Encrypt) ? 1 : 0) != 1) { THROW_EXCEPTION(CipherException, EVPInitFailure) } mpDescription->SetupParameters(&ctx); - UsePadding(mPaddingOn); // Update length for caller rOutLengthOut = outLength; @@ -423,7 +421,7 @@ int CipherContext::InSizeForOutBufferSize(int OutLength) // Strictly speaking, the *2 is unnecessary. However... // Final() is paranoid, and requires two input blocks of space to work. - return OutLength - (EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)) * 2); + return OutLength - (EVP_CIPHER_CTX_block_size(&ctx) * 2); } // -------------------------------------------------------------------------- @@ -444,7 +442,7 @@ int CipherContext::MaxOutSizeForInBufferSize(int InLength) // Final() is paranoid, and requires two input blocks of space to work, and so we need to add // three blocks on to be absolutely sure. - return InLength + (EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)) * 3); + return InLength + (EVP_CIPHER_CTX_block_size(&ctx) * 3); } @@ -458,8 +456,20 @@ int CipherContext::MaxOutSizeForInBufferSize(int InLength) // -------------------------------------------------------------------------- int CipherContext::TransformBlock(void *pOutBuffer, int OutLength, const void *pInBuffer, int InLength) { + if(!mInitialised) + { + THROW_EXCEPTION(CipherException, NotInitialised) + } + + // Warn if in a transformation + if(mWithinTransform) + { + BOX_WARNING("CipherContext::TransformBlock called when " + "context flagged as within a transform"); + } + // Check output buffer size - if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(BOX_OPENSSL_CTX(ctx)))) + if(OutLength < (InLength + EVP_CIPHER_CTX_block_size(&ctx))) { // Check if padding is off, in which case the buffer can be smaller if(!mPaddingOn && OutLength <= InLength) @@ -471,36 +481,40 @@ int CipherContext::TransformBlock(void *pOutBuffer, int OutLength, const void *p THROW_EXCEPTION(CipherException, OutputBufferTooSmall); } } - - Begin(); + + // Initialise the cipher context again + if(EVP_CipherInit(&ctx, NULL, NULL, NULL, -1) != 1) + { + THROW_EXCEPTION(CipherException, EVPInitFailure) + } // Do the entire block - int output_space_used = OutLength; + int outLength = 0; // Update - if(EVP_CipherUpdate(BOX_OPENSSL_CTX(ctx), (unsigned char*)pOutBuffer, &output_space_used, - (unsigned char*)pInBuffer, InLength) != 1) + outLength = OutLength; + if(EVP_CipherUpdate(&ctx, (unsigned char*)pOutBuffer, &outLength, (unsigned char*)pInBuffer, InLength) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPUpdateFailure, - "Failed to update " << mCipherName << ": " << LogError(GetFunction())); + "Failed to " << GetFunction() << " (update) " << + mCipherName << " cipher: " << LogError(GetFunction())); } // Finalise - int output_space_remain = OutLength - output_space_used; - -#ifdef HAVE_OLD_SSL - OldOpenSSLFinal(((unsigned char*)pOutBuffer) + output_space_used, output_space_remain); -#else - if(EVP_CipherFinal(BOX_OPENSSL_CTX(ctx), ((unsigned char*)pOutBuffer) + output_space_used, - &output_space_remain) != 1) + int outLength2 = OutLength - outLength; +#ifndef HAVE_OLD_SSL + if(EVP_CipherFinal(&ctx, ((unsigned char*)pOutBuffer) + outLength, &outLength2) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPFinalFailure, - "Failed to finalise " << mCipherName << ": " << LogError(GetFunction())); + "Failed to " << GetFunction() << " (final) " << + mCipherName << " cipher: " << LogError(GetFunction())); } +#else + OldOpenSSLFinal(((unsigned char*)pOutBuffer) + outLength, outLength2); #endif + outLength += outLength2; - mWithinTransform = false; - return output_space_used + output_space_remain; + return outLength; } @@ -519,7 +533,7 @@ int CipherContext::GetIVLength() THROW_EXCEPTION(CipherException, NotInitialised) } - return EVP_CIPHER_CTX_iv_length(BOX_OPENSSL_CTX(ctx)); + return EVP_CIPHER_CTX_iv_length(&ctx); } @@ -545,14 +559,12 @@ void CipherContext::SetIV(const void *pIV) "flagged as within a transform"); } - mIV = std::string((const char *)pIV, GetIVLength()); - // Set IV - if(EVP_CipherInit_ex(BOX_OPENSSL_CTX(ctx), NULL, NULL, NULL, - (const unsigned char *)mIV.c_str(), -1) != 1) + if(EVP_CipherInit(&ctx, NULL, NULL, (unsigned char *)pIV, -1) != 1) { THROW_EXCEPTION_MESSAGE(CipherException, EVPInitFailure, - "Failed to set IV for " << mCipherName << ": " << LogError(GetFunction())); + "Failed to " << GetFunction() << " (set IV) " << + mCipherName << " cipher: " << LogError(GetFunction())); } #ifdef HAVE_OLD_SSL @@ -589,20 +601,19 @@ const void *CipherContext::SetRandomIV(int &rLengthOut) } // Get length of IV - uint8_t generated_iv[CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH]; - unsigned int ivLen = EVP_CIPHER_CTX_iv_length(BOX_OPENSSL_CTX(ctx)); - if(ivLen > sizeof(generated_iv)) + unsigned int ivLen = EVP_CIPHER_CTX_iv_length(&ctx); + if(ivLen > sizeof(mGeneratedIV)) { THROW_EXCEPTION(CipherException, IVSizeImplementationLimitExceeded) } // Generate some random data - Random::Generate(generated_iv, ivLen); - SetIV(generated_iv); + Random::Generate(mGeneratedIV, ivLen); + SetIV(mGeneratedIV); // Return the IV and it's length rLengthOut = ivLen; - return mIV.c_str(); + return mGeneratedIV; } @@ -617,11 +628,9 @@ const void *CipherContext::SetRandomIV(int &rLengthOut) void CipherContext::UsePadding(bool Padding) { #ifndef HAVE_OLD_SSL - if(EVP_CIPHER_CTX_set_padding(BOX_OPENSSL_CTX(ctx), Padding) != 1) + if(EVP_CIPHER_CTX_set_padding(&ctx, Padding) != 1) { - THROW_EXCEPTION_MESSAGE(CipherException, EVPSetPaddingFailure, - "Failed to set padding for " << mCipherName << ": " << - LogError(GetFunction())); + THROW_EXCEPTION(CipherException, EVPSetPaddingFailure) } #endif mPaddingOn = Padding; diff --git a/lib/crypto/CipherContext.h b/lib/crypto/CipherContext.h index b6e97b4e..93c889d6 100644 --- a/lib/crypto/CipherContext.h +++ b/lib/crypto/CipherContext.h @@ -19,22 +19,6 @@ class CipherDescription; #define CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH 32 -// Macros to allow compatibility with OpenSSL 1.0 and 1.1 APIs. See -// https://github.com/charybdis-ircd/charybdis/blob/release/3.5/libratbox/src/openssl_ratbox.h -// for the gory details. -#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER >= 0x10100000L) // OpenSSL >= 1.1 -# define BOX_OPENSSL_INIT_CTX(ctx) ctx = EVP_CIPHER_CTX_new(); -# define BOX_OPENSSL_CTX(ctx) ctx -# define BOX_OPENSSL_CLEANUP_CTX(ctx) EVP_CIPHER_CTX_free(ctx) -typedef EVP_CIPHER_CTX* BOX_EVP_CIPHER_CTX; -#else // OpenSSL < 1.1 -# define BOX_OPENSSL_INIT_CTX(ctx) EVP_CIPHER_CTX_init(&ctx); // no error return code, even though the docs says it does -# define BOX_OPENSSL_CTX(ctx) &ctx -# define BOX_OPENSSL_CLEANUP_CTX(ctx) EVP_CIPHER_CTX_cleanup(&ctx) -typedef EVP_CIPHER_CTX BOX_EVP_CIPHER_CTX; -#endif - - // -------------------------------------------------------------------------- // // Class @@ -90,14 +74,16 @@ public: #endif private: - BOX_EVP_CIPHER_CTX ctx; + EVP_CIPHER_CTX ctx; bool mInitialised; bool mWithinTransform; bool mPaddingOn; + uint8_t mGeneratedIV[CIPHERCONTEXT_MAX_GENERATED_IV_LENGTH]; CipherFunction mFunction; std::string mCipherName; - const CipherDescription *mpDescription; - std::string mIV; +#ifdef HAVE_OLD_SSL + CipherDescription *mpDescription; +#endif }; diff --git a/lib/crypto/CipherException.txt b/lib/crypto/CipherException.txt index 494ed3cc..abdbac87 100644 --- a/lib/crypto/CipherException.txt +++ b/lib/crypto/CipherException.txt @@ -16,4 +16,3 @@ PseudoRandNotAvailable 12 EVPSetPaddingFailure 13 RandomInitFailed 14 Failed to read from random device LengthRequestedTooLongForRandomHex 15 -AlreadyInTransform 16 Tried to initialise crypto when already in a transform diff --git a/lib/server/TLSContext.cpp b/lib/server/TLSContext.cpp index 1a6d4a53..35e254fd 100644 --- a/lib/server/TLSContext.cpp +++ b/lib/server/TLSContext.cpp @@ -23,17 +23,6 @@ #define MAX_VERIFICATION_DEPTH 2 #define CIPHER_LIST "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" -// Macros to allow compatibility with OpenSSL 1.0 and 1.1 APIs. See -// https://github.com/charybdis-ircd/charybdis/blob/release/3.5/libratbox/src/openssl_ratbox.h -// for the gory details. -#if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER >= 0x10100000L) // OpenSSL >= 1.1 -# define BOX_TLS_SERVER_METHOD TLS_server_method -# define BOX_TLS_CLIENT_METHOD TLS_client_method -#else // OpenSSL < 1.1 -# define BOX_TLS_SERVER_METHOD TLSv1_server_method -# define BOX_TLS_CLIENT_METHOD TLSv1_client_method -#endif - // -------------------------------------------------------------------------- // // Function @@ -78,7 +67,7 @@ void TLSContext::Initialise(bool AsServer, const char *CertificatesFile, const c ::SSL_CTX_free(mpContext); } - mpContext = ::SSL_CTX_new(AsServer ? BOX_TLS_SERVER_METHOD() : BOX_TLS_CLIENT_METHOD()); + mpContext = ::SSL_CTX_new(AsServer?TLSv1_server_method():TLSv1_client_method()); if(mpContext == NULL) { THROW_EXCEPTION(ServerException, TLSAllocationFailed) diff --git a/test/crypto/testcrypto.cpp b/test/crypto/testcrypto.cpp index 32d2efb8..4e623cc2 100644 --- a/test/crypto/testcrypto.cpp +++ b/test/crypto/testcrypto.cpp @@ -266,7 +266,7 @@ int test(int argc, const char *argv[]) // Check rolling checksums uint8_t *checkdata_blk = (uint8_t *)malloc(CHECKSUM_DATA_SIZE); uint8_t *checkdata = checkdata_blk; - RAND_bytes(checkdata, CHECKSUM_DATA_SIZE); + RAND_pseudo_bytes(checkdata, CHECKSUM_DATA_SIZE); for(int size = CHECKSUM_BLOCK_SIZE_BASE; size <= CHECKSUM_BLOCK_SIZE_LAST; ++size) { // Test skip-roll code |