Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1446?usp=email
to review the following change.
Change subject: crypto_openssl: Fix various conversion warnings
......................................................................
crypto_openssl: Fix various conversion warnings
EVP_CIPHER_CTX_flags is documented to output
int on OpenSSL, but is actually unsigned long
OpenSSL 3.
On libressl it is correctly documented to output
unsigned long.
Change-Id: I99bc4692526f9143a913e29b266a1816295dfd51
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/crypto_openssl.c
1 file changed, 4 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/46/1446/1
diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c
index ec0269c..19359f3 100644
--- a/src/openvpn/crypto_openssl.c
+++ b/src/openvpn/crypto_openssl.c
@@ -896,11 +896,6 @@
return EVP_CIPHER_CTX_mode(ctx);
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
bool
cipher_ctx_mode_cbc(const cipher_ctx_t *ctx)
{
@@ -909,7 +904,7 @@
return false;
}
- int flags = EVP_CIPHER_CTX_flags(ctx);
+ unsigned long flags = EVP_CIPHER_CTX_flags(ctx);
int mode = EVP_CIPHER_CTX_mode(ctx);
return mode == EVP_CIPH_CBC_MODE
@@ -940,7 +935,7 @@
{
if (ctx)
{
- int flags = EVP_CIPHER_CTX_flags(ctx);
+ unsigned long flags = EVP_CIPHER_CTX_flags(ctx);
if (flags & EVP_CIPH_FLAG_AEAD_CIPHER)
{
return true;
@@ -995,8 +990,8 @@
cipher_ctx_final_check_tag(EVP_CIPHER_CTX *ctx, uint8_t *dst, int *dst_len,
uint8_t *tag,
size_t tag_len)
{
- ASSERT(tag_len < SIZE_MAX);
- if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag))
+ ASSERT(tag_len < INT_MAX);
+ if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, (int)tag_len, tag))
{
return 0;
}
@@ -1004,10 +999,6 @@
return cipher_ctx_final(ctx, dst, dst_len);
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/*
*
* Generic message digest information functions
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1446?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I99bc4692526f9143a913e29b266a1816295dfd51
Gerrit-Change-Number: 1446
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
