ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fix some warnings with --with-tls=openssl

Browse Source 
Change-Id: I17cc8919aeecaddb09f2fbf37611b672e4859ff0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99029
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-07-20 11:59:04 +02:00
parent 6a54960f6b
commit 57d6ba4e49
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oox/source/crypto/CryptTools.cxx
+3 -3
View File
@@ -44,7 +44,7 @@ struct CryptoImpl
return;
if (iv.empty())
EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), 0);
EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), nullptr);
else
EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), iv.data());
EVP_CIPHER_CTX_set_padding(mpContext.get(), 0);
@@ -64,7 +64,7 @@ struct CryptoImpl
key.resize(nMinKeySize, 0);
if (iv.empty())
EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), 0);
EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), nullptr);
else
{
const size_t nMinIVSize = EVP_CIPHER_iv_length(pCipher);
@@ -101,7 +101,7 @@ struct CryptoImpl
HMAC_CTX_cleanup(mpHmacContext.get());
}
const EVP_CIPHER* getCipher(Crypto::CryptoType type)
static const EVP_CIPHER* getCipher(Crypto::CryptoType type)
{
switch(type)
{