diff options
author | George Hazan <ghazan@miranda.im> | 2019-04-08 19:11:24 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2019-04-08 19:11:24 +0300 |
commit | 106ee67ae25419a2258c91b2d6e7a00312a51de0 (patch) | |
tree | 62e9b1cf626e00db59bec3a809ec2e4543d28e70 /protocols/JabberG/src/jabber_omemo.cpp | |
parent | c78da653c2806e0ac72e0c7baa499342a4c637e5 (diff) |
Jabber: merge of fixes from trunk
Diffstat (limited to 'protocols/JabberG/src/jabber_omemo.cpp')
-rwxr-xr-x | protocols/JabberG/src/jabber_omemo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp index 60027fabc2..dce6f4cc7e 100755 --- a/protocols/JabberG/src/jabber_omemo.cpp +++ b/protocols/JabberG/src/jabber_omemo.cpp @@ -220,7 +220,7 @@ complete: return SG_ERR_UNKNOWN;
}
- if (plaintext_len > INT_MAX - EVP_CIPHER_block_size(evp_cipher)) {
+ if ((int)plaintext_len > INT_MAX - EVP_CIPHER_block_size(evp_cipher)) {
//fprintf(stderr, "invalid plaintext length: %zu\n", plaintext_len);
return SG_ERR_UNKNOWN;
}
@@ -300,7 +300,7 @@ complete: return SG_ERR_INVAL;
}
- if (ciphertext_len > INT_MAX - EVP_CIPHER_block_size(evp_cipher)) {
+ if ((int)ciphertext_len > INT_MAX - EVP_CIPHER_block_size(evp_cipher)) {
//fprintf(stderr, "invalid ciphertext length: %zu\n", ciphertext_len);
return SG_ERR_UNKNOWN;
}
|