cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1287?usp=email )
Change subject: crypto_backend: Change len argument of md_ctx_update to size_t ...................................................................... crypto_backend: Change len argument of md_ctx_update to size_t The underlying APIs already use size_t and all the users (only httpdigest and push) already put size_t into it. So avoid conversion warnings. Also fix one trivial conversion warning in push.c to able to easily remove the -Wconversion override from the affected code paths. Change-Id: I27f2fcd903d26ccbfbd0cdc45f99cc3cd8b0e49a Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1287 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg33973.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/crypto_backend.h M src/openvpn/crypto_mbedtls.c M src/openvpn/crypto_openssl.c M src/openvpn/httpdigest.c M src/openvpn/push.c 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h index 4d6a96c..e95752a 100644 --- a/src/openvpn/crypto_backend.h +++ b/src/openvpn/crypto_backend.h @@ -599,7 +599,7 @@ * @param src Buffer to digest. May not be NULL. * @param src_len The length of the incoming buffer. */ -void md_ctx_update(md_ctx_t *ctx, const uint8_t *src, int src_len); +void md_ctx_update(md_ctx_t *ctx, const uint8_t *src, size_t src_len); /* * Output the message digest to the given buffer. diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index 076d4ee..2e328c3 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -765,6 +765,10 @@ return 1; } +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop +#endif + /* * * Generic message digest information functions @@ -877,7 +881,7 @@ } void -md_ctx_update(mbedtls_md_context_t *ctx, const uint8_t *src, int src_len) +md_ctx_update(mbedtls_md_context_t *ctx, const uint8_t *src, size_t src_len) { ASSERT(0 == mbedtls_md_update(ctx, src, src_len)); } @@ -994,6 +998,11 @@ seed_len, output, output_len)); } #else /* defined(HAVE_MBEDTLS_SSL_TLS_PRF) && defined(MBEDTLS_SSL_TLS_PRF_TLS1) */ +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif + /* * Generate the hash required by for the \c tls1_PRF function. * @@ -1122,10 +1131,10 @@ gc_free(&gc); return true; } -#endif /* HAVE_MBEDTLS_SSL_TLS_PRF && defined(MBEDTLS_SSL_TLS_PRF_TLS1) */ #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic pop #endif +#endif /* HAVE_MBEDTLS_SSL_TLS_PRF && defined(MBEDTLS_SSL_TLS_PRF_TLS1) */ #endif /* ENABLE_CRYPTO_MBEDTLS */ diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index f596b8c..ec0269c 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -1165,7 +1165,7 @@ } void -md_ctx_update(EVP_MD_CTX *ctx, const uint8_t *src, int src_len) +md_ctx_update(EVP_MD_CTX *ctx, const uint8_t *src, size_t src_len) { EVP_DigestUpdate(ctx, src, src_len); } diff --git a/src/openvpn/httpdigest.c b/src/openvpn/httpdigest.c index f665b17..be20638 100644 --- a/src/openvpn/httpdigest.c +++ b/src/openvpn/httpdigest.c @@ -61,11 +61,6 @@ Hex[HASHHEXLEN] = '\0'; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - /* calculate H(A1) as per spec */ void DigestCalcHA1(IN char *pszAlg, IN char *pszUserName, IN char *pszRealm, IN char *pszPassword, @@ -150,8 +145,4 @@ CvtHex(RespHash, Response); } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - #endif /* if PROXY_DIGEST_AUTH */ diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 2c717c7..6f146fc 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -772,6 +772,10 @@ return true; } +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop +#endif + void send_push_reply_auth_token(struct tls_multi *multi) { @@ -1046,7 +1050,7 @@ unsigned int *option_types_found, struct buffer *buf) { int ret = PUSH_MSG_ERROR; - const uint8_t ch = buf_read_u8(buf); + const int ch = buf_read_u8(buf); if (ch == ',') { struct buffer buf_orig = (*buf); @@ -1090,10 +1094,6 @@ return ret; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - int process_incoming_push_msg(struct context *c, const struct buffer *buffer, bool honor_received_options, unsigned int permission_mask, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1287?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I27f2fcd903d26ccbfbd0cdc45f99cc3cd8b0e49a Gerrit-Change-Number: 1287 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
