cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1538?usp=email )
Change subject: Unbreak Mbed TLS 4 build ...................................................................... Unbreak Mbed TLS 4 build The previous Mbed TLS 4 change removed the mbedtls/version.h include from syshead.h. But this include in mbedtls_compat.h where it's needed. Also fix a warning by removing a size_t < 0 comparison. Change-Id: Ia5d330fe5c922aaa6948c1fb05c9a4947c833311 Signed-off-by: Max Fillinger <[email protected]> Acked-by: Frank Lichtenheld <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1538 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg35701.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/crypto_mbedtls.c M src/openvpn/mbedtls_compat.h 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index cba6bb5..e8931d7 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -700,7 +700,7 @@ md_full(const char *mdname, const uint8_t *src, size_t src_len, uint8_t *dst) { const md_info_t *md = md_get(mdname); - if (md == NULL || src_len < 0) + if (md == NULL) { return false; } diff --git a/src/openvpn/mbedtls_compat.h b/src/openvpn/mbedtls_compat.h index 667529e..50739b6 100644 --- a/src/openvpn/mbedtls_compat.h +++ b/src/openvpn/mbedtls_compat.h @@ -36,6 +36,7 @@ #include <mbedtls/asn1.h> #include <mbedtls/pk.h> +#include <mbedtls/version.h> #if MBEDTLS_VERSION_NUMBER < 0x04000000 #include <mbedtls/ctr_drbg.h> -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1538?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: Ia5d330fe5c922aaa6948c1fb05c9a4947c833311 Gerrit-Change-Number: 1538 Gerrit-PatchSet: 3 Gerrit-Owner: MaxF <[email protected]> Gerrit-Reviewer: flichtenheld <[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
