[Libreoffice-commits] core.git: oox/source

[Caolán McNamara (via logerrit)]

 oox/source/crypto/CryptTools.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 57d6ba4e49ebe3adfcb471e34ac2d4be14e1bce3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 20 09:52:27 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 20 11:59:04 2020 +0200

    fix some warnings with --with-tls=openssl
    
    Change-Id: I17cc8919aeecaddb09f2fbf37611b672e4859ff0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99029
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index ff11ebbc0436..3b95616df18e 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -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)
         {