core.git: Branch 'distro/collabora/co-24.04' - comphelper/source

[Stephan Bergmann (via logerrit)]

 comphelper/source/crypto/Crypto.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6a37377bb421353968506524b9b40417408e2928
Author:     Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Nov 5 08:31:16 2024 +0100
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Nov 11 16:28:12 2024 +0100

    Fix USE_TLS_OPENSSL builds
    
    ...after c8cba8ae30baef6feca3b0613366d28df4a5e568 "move CryptTools from oox 
to
    comphelper so we can reuse it"
    
    Change-Id: Id899c9fac9f18833afd64f18d81a7ad50916872e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176041
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
    Tested-by: Jenkins
    (cherry picked from commit bb9090c60b8731a35a273cb616a04d21a9b6a125)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176394
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/comphelper/source/crypto/Crypto.cxx 
b/comphelper/source/crypto/Crypto.cxx
index 414de410d930..f419530cad07 100644
--- a/comphelper/source/crypto/Crypto.cxx
+++ b/comphelper/source/crypto/Crypto.cxx
@@ -73,7 +73,7 @@ struct CryptoImpl
     CryptoImpl() = default;
 
     void setupEncryptContext(std::vector<sal_uInt8>& key, 
std::vector<sal_uInt8>& iv,
-                             Crypto::CryptoType eType)
+                             CryptoType eType)
     {
         mpContext.reset(EVP_CIPHER_CTX_new());
         EVP_CIPHER_CTX_init(mpContext.get());
@@ -90,7 +90,7 @@ struct CryptoImpl
     }
 
     void setupDecryptContext(std::vector<sal_uInt8>& key, 
std::vector<sal_uInt8>& iv,
-                             Crypto::CryptoType eType)
+                             CryptoType eType)
     {
         mpContext.reset(EVP_CIPHER_CTX_new());
         EVP_CIPHER_CTX_init(mpContext.get());
@@ -148,15 +148,15 @@ struct CryptoImpl
             EVP_CIPHER_CTX_cleanup(mpContext.get());
     }
 
-    static const EVP_CIPHER* getCipher(Crypto::CryptoType type)
+    static const EVP_CIPHER* getCipher(CryptoType type)
     {
         switch (type)
         {
-            case Crypto::CryptoType::AES_128_ECB:
+            case CryptoType::AES_128_ECB:
                 return EVP_aes_128_ecb();
-            case Crypto::CryptoType::AES_128_CBC:
+            case CryptoType::AES_128_CBC:
                 return EVP_aes_128_cbc();
-            case Crypto::CryptoType::AES_256_CBC:
+            case CryptoType::AES_256_CBC:
                 return EVP_aes_256_cbc();
             default:
                 break;