commit 1897af9e9318ee674f37fac065b262e1c7565171
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Sun May 10 23:27:38 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon May 11 14:35:41 2015 +0200
tree e17e04c45366e455670c9791507db8df6446556c
parent 17a40cd255aad24743840561af30bdfc7a34f31c

Make conf const inside ssl_context (finally)

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 0b9de03..c16b6e7 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -572,10 +572,11 @@
         ssl->minor_ver = ssl->conf->min_minor_ver;
     }
 
-    if( ssl->conf->max_major_ver == 0 && ssl->conf->max_minor_ver == 0 )
+    if( ssl->conf->max_major_ver == 0 )
     {
-        ssl->conf->max_major_ver = MBEDTLS_SSL_MAX_MAJOR_VERSION;
-        ssl->conf->max_minor_ver = MBEDTLS_SSL_MAX_MINOR_VERSION;
+        MBEDTLS_SSL_DEBUG_MSG( 1, ( "configured max major version is invalid, "
+                            "consider using mbedtls_ssl_config_defaults()" ) );
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
     }
 
     /*

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 4406c1a..5fb2b62 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4959,7 +4959,7 @@
  * Setup an SSL context
  */
 int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
-                       mbedtls_ssl_config *conf )
+                       const mbedtls_ssl_config *conf )
 {
     int ret;
     const size_t len = MBEDTLS_SSL_BUFFER_LEN;