diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:49:13 -0500 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:49:13 -0500 |
| commit | f28f88e5e72ba1499409047a9d6985eb312c0232 (patch) | |
| tree | c9c267f18264b3dfe715a363935bb6ac20904492 /lib/crypto/CipherBlowfish.cpp | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
| parent | 6d7e9562e8485591a4888f1fc2d3c6c657dc7a01 (diff) | |
Merge tag 'BoxBackup-0.12.master.180102.6d7e956' into upstream
Diffstat (limited to 'lib/crypto/CipherBlowfish.cpp')
| -rw-r--r-- | lib/crypto/CipherBlowfish.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/CipherBlowfish.cpp b/lib/crypto/CipherBlowfish.cpp index e16cc6ed..4c75b1de 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, NULL, NULL, (unsigned char*)mpKey, (unsigned char*)mpInitialisationVector, -1) != 1) + if(EVP_CipherInit_ex(pCipherContext, GetCipher(), 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 |