[Libreoffice-commits] core.git: sal/rtl

[Stephan Bergmann (via logerrit)]

 sal/rtl/cipher.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 44af200f59f37c73a6dea3bcbee61a1ebb24f99a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 12 09:46:25 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Nov 12 13:03:16 2019 +0100

    Silence -Werror=sign-compare (--enable-cipher-openssl-backend)
    
    as found by <https://ci.libreoffice.org/job/lo_tb_random_config_linux/2039/>
    
    Change-Id: Ie698b7905bd2f25e74791f91f586479d1fc473dc
    Reviewed-on: https://gerrit.libreoffice.org/82488
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx
index 5077119babe9..26d9cca29afc 100644
--- a/sal/rtl/cipher.cxx
+++ b/sal/rtl/cipher.cxx
@@ -717,7 +717,7 @@ static rtlCipherError BF_update(
     assert(eMode == rtl_Cipher_ModeStream);
     (void) eMode;
     (void) eDirection;
-    while (nDatLen > std::numeric_limits<int>::max()) {
+    while (nDatLen > static_cast<unsigned int>(std::numeric_limits<int>::max())) {
         int outl;
         if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, std::numeric_limits<int>::max())
             == 0)
@@ -1043,7 +1043,7 @@ rtlCipherError SAL_CALL rtl_cipher_initBF(
         // Cannot easily support DirectionBoth, and it isn't used in the LO code at least:
         return rtl_Cipher_E_Direction;
     }
-    if (nKeyLen > std::numeric_limits<int>::max()) {
+    if (nKeyLen > static_cast<unsigned int>(std::numeric_limits<int>::max())) {
         return rtl_Cipher_E_BufferSize;
     }
     if (pImpl->m_context.m_context != nullptr) {
@@ -1176,7 +1176,7 @@ static rtlCipherError rtl_cipherARCFOUR_init_Impl(
     const sal_uInt8     *pKeyData, sal_Size nKeyLen)
 {
 #if defined LIBO_CIPHER_OPENSSL_BACKEND
-    if (nKeyLen > std::numeric_limits<int>::max()) {
+    if (nKeyLen > static_cast<unsigned int>(std::numeric_limits<int>::max())) {
         return rtl_Cipher_E_BufferSize;
     }
     if (ctx->m_context != nullptr) {
@@ -1256,7 +1256,7 @@ static rtlCipherError rtl_cipherARCFOUR_update_Impl(
         return rtl_Cipher_E_BufferSize;
 
 #if defined LIBO_CIPHER_OPENSSL_BACKEND
-    while (nDatLen > std::numeric_limits<int>::max()) {
+    while (nDatLen > static_cast<unsigned int>(std::numeric_limits<int>::max())) {
         int outl;
         if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, std::numeric_limits<int>::max())
             == 0)