commit 33b9b25a480620ad069e0fd7cda7f5b3cd74170f
author Hanno Becker <hanno.becker@arm.com> Fri Jul 05 11:23:25 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Fri Jul 12 15:15:08 2019 +0100
tree 5c9a879f6c40d881b443c0c05d24242977dd4bcc
parent cb8774b6e88b1f4a9cbb091bc08dfb0eb0b14630

Remove SSL version configuration API if versions are hardcoded

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index d47102c..e00f7b9 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -3009,6 +3009,8 @@
 const char *mbedtls_ssl_get_alpn_protocol( const mbedtls_ssl_context *ssl );
 #endif /* MBEDTLS_SSL_ALPN */
 
+#if !defined(MBEDTLS_SSL_CONF_MAX_MINOR_VER) || \
+    !defined(MBEDTLS_SSL_CONF_MAX_MAJOR_VER)
 /**
  * \brief          Set the maximum supported version sent from the client side
  *                 and/or accepted at the server side
@@ -3031,7 +3033,11 @@
  *                 MBEDTLS_SSL_MINOR_VERSION_3 supported)
  */
 void mbedtls_ssl_conf_max_version( mbedtls_ssl_config *conf, int major, int minor );
+#endif /* MBEDTLS_SSL_CONF_MAX_MINOR_VER ||
+          MBEDTLS_SSL_CONF_MAX_MAJOR_VER */
 
+#if !defined(MBEDTLS_SSL_CONF_MIN_MINOR_VER) || \
+    !defined(MBEDTLS_SSL_CONF_MIN_MAJOR_VER)
 /**
  * \brief          Set the minimum accepted SSL/TLS protocol version
  *                 (Default: TLS 1.0)
@@ -3056,6 +3062,8 @@
  *                 MBEDTLS_SSL_MINOR_VERSION_3 supported)
  */
 void mbedtls_ssl_conf_min_version( mbedtls_ssl_config *conf, int major, int minor );
+#endif /* MBEDTLS_SSL_CONF_MIN_MINOR_VER ||
+          MBEDTLS_SSL_CONF_MIN_MAJOR_VER */
 
 #if defined(MBEDTLS_SSL_FALLBACK_SCSV) && defined(MBEDTLS_SSL_CLI_C)
 /**

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index e0f5b2b..8fb548c 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -8734,45 +8734,27 @@
 }
 #endif /* MBEDTLS_SSL_ALPN */
 
-void mbedtls_ssl_conf_max_version( mbedtls_ssl_config *conf, int major, int minor )
+#if !defined(MBEDTLS_SSL_CONF_MAX_MINOR_VER) || \
+    !defined(MBEDTLS_SSL_CONF_MAX_MAJOR_VER)
+void mbedtls_ssl_conf_max_version( mbedtls_ssl_config *conf,
+                                   int major, int minor )
 {
-#if defined(MBEDTLS_SSL_CONF_MAX_MAJOR_VER) && \
-    defined(MBEDTLS_SSL_CONF_MAX_MINOR_VER)
-    ((void) conf);
-#endif
-
-#if !defined(MBEDTLS_SSL_CONF_MAX_MAJOR_VER)
     conf->max_major_ver = major;
-#else
-    ((void) major);
-#endif /* MBEDTLS_SSL_CONF_MAX_MAJOR_VER */
-
-#if !defined(MBEDTLS_SSL_CONF_MAX_MINOR_VER)
     conf->max_minor_ver = minor;
-#else
-    ((void) minor);
-#endif /* !MBEDTLS_SSL_CONF_MAX_MINOR_VER */
 }
+#endif /* MBEDTLS_SSL_CONF_MAX_MINOR_VER ||
+          MBEDTLS_SSL_CONF_MAX_MAJOR_VER */
 
-void mbedtls_ssl_conf_min_version( mbedtls_ssl_config *conf, int major, int minor )
+#if !defined(MBEDTLS_SSL_CONF_MIN_MINOR_VER) || \
+    !defined(MBEDTLS_SSL_CONF_MIN_MAJOR_VER)
+void mbedtls_ssl_conf_min_version( mbedtls_ssl_config *conf,
+                                   int major, int minor )
 {
-#if defined(MBEDTLS_SSL_CONF_MIN_MAJOR_VER) && \
-    defined(MBEDTLS_SSL_CONF_MIN_MINOR_VER)
-    ((void) conf);
-#endif
-
-#if !defined(MBEDTLS_SSL_CONF_MIN_MAJOR_VER)
     conf->min_major_ver = major;
-#else
-    ((void) major);
-#endif /* MBEDTLS_SSL_CONF_MIN_MAJOR_VER */
-
-#if !defined(MBEDTLS_SSL_CONF_MIN_MINOR_VER)
     conf->min_minor_ver = minor;
-#else
-    ((void) minor);
-#endif /* !MBEDTLS_SSL_CONF_MIN_MINOR_VER */
 }
+#endif /* MBEDTLS_SSL_CONF_MIN_MINOR_VER ||
+          MBEDTLS_SSL_CONF_MIN_MAJOR_VER */
 
 #if defined(MBEDTLS_SSL_FALLBACK_SCSV) && defined(MBEDTLS_SSL_CLI_C)
 void mbedtls_ssl_conf_fallback( mbedtls_ssl_config *conf, char fallback )