mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence -Werror=sign-compare (--enable-cipher-openssl-backend)

Browse Source 
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@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-11-12 09:46:25 +01:00
parent 431950e1ea
commit 44af200f59
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sal/rtl/cipher.cxx
View File

@@ -717,7 +717,7 @@ static rtlCipherError BF_update(
assert(eMode == rtl_Cipher_ModeStream); assert(eMode == rtl_Cipher_ModeStream);
(void) eMode; (void) eMode;
(void) eDirection; (void) eDirection;
while (nDatLen > std::numeric_limits<int>::max()) { while (nDatLen > static_cast<unsigned int>(std::numeric_limits<int>::max())) {
int outl; int outl;
if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, std::numeric_limits<int>::max()) if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, std::numeric_limits<int>::max())
== 0) == 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: // Cannot easily support DirectionBoth, and it isn't used in the LO code at least:
return rtl_Cipher_E_Direction; 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; return rtl_Cipher_E_BufferSize;
} }
if (pImpl->m_context.m_context != nullptr) { if (pImpl->m_context.m_context != nullptr) {
@@ -1176,7 +1176,7 @@ static rtlCipherError rtl_cipherARCFOUR_init_Impl(
const sal_uInt8 *pKeyData, sal_Size nKeyLen) const sal_uInt8 *pKeyData, sal_Size nKeyLen)
{ {
#if defined LIBO_CIPHER_OPENSSL_BACKEND #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; return rtl_Cipher_E_BufferSize;
} }
if (ctx->m_context != nullptr) { if (ctx->m_context != nullptr) {
@@ -1256,7 +1256,7 @@ static rtlCipherError rtl_cipherARCFOUR_update_Impl(
return rtl_Cipher_E_BufferSize; return rtl_Cipher_E_BufferSize;
#if defined LIBO_CIPHER_OPENSSL_BACKEND #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; int outl;
if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, std::numeric_limits<int>::max()) if (EVP_CipherUpdate(ctx->m_context, pBuffer, &outl, pData, std::numeric_limits<int>::max())
== 0) == 0)