Gert Doering has submitted this change. ( https://gerrit.openvpn.net/c/openvpn/+/2006?usp=email )
Change subject: crypto_openssl: Avoid conversion warning in hmac_ctx_size (1.1.1 variant) ...................................................................... crypto_openssl: Avoid conversion warning in hmac_ctx_size (1.1.1 variant) We already have a similar conversion in hmac_ctx_size 3.0 variant. Change-Id: I7c54aba5ce771fc4a10e4efde7d14721cbcd7bc1 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Razvan Cojocaru <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2006 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg40019.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/crypto_openssl.c 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index 29c5fa6..e6abd8f 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -1172,21 +1172,12 @@ HMAC_CTX_reset(ctx); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - int hmac_ctx_size(HMAC_CTX *ctx) { - return HMAC_size(ctx); + return (int)HMAC_size(ctx); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - void hmac_ctx_reset(HMAC_CTX *ctx) { -- To view, visit https://gerrit.openvpn.net/c/openvpn/+/2006?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I7c54aba5ce771fc4a10e4efde7d14721cbcd7bc1 Gerrit-Change-Number: 2006 Gerrit-PatchSet: 2 Gerrit-Owner: Frank Lichtenheld <[email protected]> Gerrit-Reviewer: Arne Schwabe <[email protected]> Gerrit-Reviewer: Gert Doering <[email protected]> Gerrit-Reviewer: Răzvan Cojocaru <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
