Possible fix for Wtype-limits on 32bits platforms in Sodium extension

Author: Girgias

ext/sodium/libsodium.c

@@ -1952,7 +1952,8 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_encrypt)
 		zend_throw_exception(sodium_exception_ce, "arithmetic overflow", 0);
 		RETURN_THROWS();
 	}
-	if ((unsigned long long) msg_len > (16ULL * ((1ULL << 32) - 2ULL)) - crypto_aead_aes256gcm_ABYTES) {
+	/* No-op to fix [-Wtype-limits] on 32bits platforms */
+	if ((unsigned long long) msg_len * 1ULL > (16ULL * ((1ULL << 32) - 2ULL)) - crypto_aead_aes256gcm_ABYTES) {
 		zend_throw_exception(sodium_exception_ce, "message too long for a single key", 0);
 		RETURN_THROWS();
 	}
@@ -2011,7 +2012,8 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_decrypt)
 	if (ciphertext_len < crypto_aead_aes256gcm_ABYTES) {
 		RETURN_FALSE;
 	}
-	if (ciphertext_len - crypto_aead_aes256gcm_ABYTES > 16ULL * ((1ULL << 32) - 2ULL)) {
+	/* No-op to fix [-Wtype-limits] on 32bits platforms */
+	if (ciphertext_len - crypto_aead_aes256gcm_ABYTES + 0ULL > 16ULL * ((1ULL << 32) - 2ULL)) {
 		zend_argument_error(sodium_exception_ce, 1, "is too long");
 		RETURN_THROWS();
 	}
@@ -2187,7 +2189,8 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_encrypt)
 		zend_throw_exception(sodium_exception_ce, "arithmetic overflow", 0);
 		RETURN_THROWS();
 	}
-	if ((unsigned long long) msg_len > 64ULL * (1ULL << 32) - 64ULL) {
+	/* No-op to fix [-Wtype-limits] on 32bits platforms */
+	if ((unsigned long long) msg_len * 1ULL > 64ULL * (1ULL << 32) - 64ULL) {
 		zend_throw_exception(sodium_exception_ce, "message too long for a single key", 0);
 		RETURN_THROWS();
 	}