Fix --tls-version-max in mbed TLS builds

These define renames were missed in the migration to 2.x, causing the maximum TLS version to be detected incorrectly.

---
 src/openvpn/ssl_mbedtls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index bc62015..d801c5d 100644
@@ -729,9 +729,9 @@ void tls_ctx_personalise_random(struct tls_root_ctx *ctx)
 int
 tls_version_max(void)
 {
-#if defined(SSL_MAJOR_VERSION_3) && defined(SSL_MINOR_VERSION_3)
+#if defined(MBEDTLS_SSL_MAJOR_VERSION_3) && defined(MBEDTLS_SSL_MINOR_VERSION_3)
   return TLS_VER_1_2;
-#elif defined(SSL_MAJOR_VERSION_3) && defined(SSL_MINOR_VERSION_2)
+#elif defined(MBEDTLS_SSL_MAJOR_VERSION_3) && defined(MBEDTLS_SSL_MINOR_VERSION_2)
   return TLS_VER_1_1;
 #else
   return TLS_VER_1_0;

2.7.4

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

ACK.

Extended the commit message slightly on the fly, explaining the macros and how to interpret them.

Your patch has been applied to the master branch.

commit 8215b7a873400b85137f6e42cd7999dd12b00b71

Author: Steffan Karger
Date:   Fri Nov 4 21:03:44 2016 +0100

     Fix --tls-version-max in mbed TLS builds

     Signed-off-by: Steffan Karger <[email protected]...>
     Acked-by: David Sommerseth <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://www.mail-archive.com/search?l=mid&[email protected]...
     Signed-off-by: David Sommerseth <[email protected]...>

- --
kind regards,

David Sommerseth

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJYHPrlAAoJEIbPlEyWcf3yuCAP/iv00WxlDtv7hS3SBK71HCJP VDL57P3kpYPqAVvrLXgf3eLWKUqncwFnrIrZmMAPMFwSgxxEAZgjvGQlS6/LUtMm iLeRKHWs75nysmXrfrnUG7kZGIfWV2+XfLIApAaOCVPQuzpNhwr2ICfUOWhDzKF4 kpAUmyb102Nsysi1OrKYw5AP+uDNiXcgw+7SsYBMHXUJp2QgKZRixSm40eG5Cc2y HHrhwPA1eyUqsItbh36W2hPJ8CTclGw07sptE7hzPo16zG/GsDqJL/pszlmt9Zix y4O5RODYRyJ25ORzjzGYZTT4khkKw+yI7DsRRu2CFUcWbvorQnUJ1DYVW46h0Ucc wvsDyw6QNWmZnl5eNkLWegw/Q7z6g5wko5zLIuwqpMuQ9lNiNaWyYTa9XpR0XiGJ 627smhVpIaLY+bYm9QZX3mybOIRYjsyV+SPLCn9RauwHe7wqf4J9MqTryND7mssZ XsY2PLZVhEjsCzfdBWRiD0CAq0faKf5gmoFDGapUXwio0y4CFetQZtRWoWyxc2DK 6QExTfump0B2sI3LJjwdK78m/vIfsEQum0px3/EpgaeY+LTygS44uyemAemHDXG/ E1NdHr29W8yqK0cfH+q9P3jo6Zgbh9qlbPg8U394n3AaGsk74UNpBmBzmcslRqrB CmSqEbZFCJYIUEVan2jH
=a1RL
-----END PGP SIGNATURE-----