diff options
| author | Chris Wilson <qris@users.noreply.github.com> | 2018-03-12 22:06:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 22:06:29 +0000 |
| commit | 82445a8e54abbcb37e41db532130dcb82088ac5d (patch) | |
| tree | 28b9f1ac7afb1f062035ca4c6021325e4e0050c3 /lib/crypto/CipherBlowfish.cpp | |
| parent | 4a9c1e9f305ae4317cdd05d2641db2da86eef615 (diff) | |
| parent | f2223e6a6db1d8b282ab23a80fb34d7a89bb3a20 (diff) | |
Merge branch 'master' into fix_raidfile_i386
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 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 |