commit 585e9e0922c248f2d167a20e4716efc4080bcd4a
author Kevin Bracey <kevin.bracey@arm.com> Tue Nov 03 12:22:27 2020 +0200
committer Kevin Bracey <kevin.bracey@arm.com> Wed Nov 04 15:16:22 2020 +0200
tree 2dabb0a33fa926ec3e3de59e08bdf1f1d1b3b8c8
parent d859db833c6c8eef7f5f4717f03287e11e8cd9c2

Add MBEDTLS_SSL_CONF_TRANSPORT

Follow the model of `MBEDTLS_SSL_CONF_ENDPOINT`. This saves a small
amount - most of the saving was already acheived via`
MBEDTLS_SSL_TRANSPORT_IS_TLS` but we can scrape out a little more by
totally eliminating `ssl->conf->transport` references.

Signed-off-by: Kevin Bracey <kevin.bracey@arm.com>

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 96f7446..389a24e 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1468,7 +1468,8 @@
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello v3, protocol version: [%d:%d]",
                    buf[1], buf[2] ) );
 
-    mbedtls_ssl_read_version( &major, &minor, ssl->conf->transport, buf + 1 );
+    mbedtls_ssl_read_version( &major, &minor,
+                              mbedtls_ssl_conf_get_transport( ssl->conf ), buf + 1 );
 
     /* According to RFC 5246 Appendix E.1, the version here is typically
      * "{03,00}, the lowest version number supported by the client, [or] the
@@ -1674,7 +1675,7 @@
     {
         int minor_ver, major_ver;
         mbedtls_ssl_read_version( &major_ver, &minor_ver,
-                                  ssl->conf->transport,
+                                  mbedtls_ssl_conf_get_transport( ssl->conf ),
                                   buf );
 
 #if defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) ||        \
@@ -2703,7 +2704,7 @@
      * version looks like the most interoperable thing to do. */
     mbedtls_ssl_write_version( mbedtls_ssl_get_major_ver( ssl ),
                                mbedtls_ssl_get_minor_ver( ssl ),
-                               ssl->conf->transport, p );
+                               mbedtls_ssl_conf_get_transport( ssl->conf ), p );
     MBEDTLS_SSL_DEBUG_BUF( 3, "server version", p, 2 );
     p += 2;
 
@@ -2797,7 +2798,7 @@
 
     mbedtls_ssl_write_version( mbedtls_ssl_get_major_ver( ssl ),
                                mbedtls_ssl_get_minor_ver( ssl ),
-                               ssl->conf->transport, p );
+                               mbedtls_ssl_conf_get_transport( ssl->conf ), p );
     p += 2;
 
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, chosen version: [%d:%d]",
@@ -4001,7 +4002,7 @@
 
     mbedtls_ssl_write_version( ssl->handshake->max_major_ver,
                                ssl->handshake->max_minor_ver,
-                               ssl->conf->transport, ver );
+                               mbedtls_ssl_conf_get_transport( ssl->conf ), ver );
 
     /* Avoid data-dependent branches while checking for invalid
      * padding, to protect against timing-based Bleichenbacher-type