commit 5624ec824e8a495c1fce5fe8a49907ef0852cbc1
author Simon Butcher <simon.butcher@arm.com> Tue Sep 29 01:06:06 2015 +0100
committer Simon Butcher <simon.butcher@arm.com> Tue Sep 29 01:06:06 2015 +0100
tree 6f669bb6f86d502501ef0935e662b910a41023ca
parent 04799a4274c814466f670f568ca442b8c1a2cbcb

Reordered TLS extension fields in client

Session ticket placed at end

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4eb8dd8..d4d8598 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@
    * Added checking of hostname length in mbedtls_ssl_set_hostname() to ensure
      domain names are compliant with RFC 1035.
 
-= mbe TLS 2.1.1 released 2015-09-17
+= mbed TLS 2.1.1 released 2015-09-17
 
 Security
    * Add countermeasure against Lenstra's RSA-CRT attack for PKCS#1 v1.5

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 1ba8648..32eae0f 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -909,13 +909,13 @@
     ext_len += olen;
 #endif
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS)
-    ssl_write_session_ticket_ext( ssl, p + 2 + ext_len, &olen );
+#if defined(MBEDTLS_SSL_ALPN)
+    ssl_write_alpn_ext( ssl, p + 2 + ext_len, &olen );
     ext_len += olen;
 #endif
 
-#if defined(MBEDTLS_SSL_ALPN)
-    ssl_write_alpn_ext( ssl, p + 2 + ext_len, &olen );
+#if defined(MBEDTLS_SSL_SESSION_TICKETS)
+    ssl_write_session_ticket_ext( ssl, p + 2 + ext_len, &olen );
     ext_len += olen;
 #endif