commit 3caf7189f9b75ce1394129f78b77001be58f27ae
author Hanno Becker <hanno.becker@arm.com> Wed Jul 24 13:34:14 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Thu Jul 25 12:58:44 2019 +0100
tree 790f31bbb29a3c60a5858c3aeef2889ab13c4257
parent de62da9d3c9cfca10c7d8653520b1e006d8c8268

Remove field to store level of pending alert

Pending alerts is so far only used for fatal alerts.

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index a871540..f613ff64 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1235,7 +1235,6 @@
 {
     const mbedtls_ssl_config *conf; /*!< configuration information          */
 
-    unsigned char pend_alert_level;
     unsigned char pend_alert_msg;
 
     /*

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 82fd62b..676c112 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -1734,8 +1734,6 @@
     mbedtls_ssl_context *ssl,
     unsigned char message )
 {
-    /* ssl->pend_alert_level is fatal by default,
-     * so we don't need set it here. */
     ssl->pend_alert_msg = message;
     return( 0 );
 }

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 1d500c4..c9a9e29 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -7975,7 +7975,6 @@
         goto error;
 
     ssl->pend_alert_msg   = MBEDTLS_SSL_ALERT_MSG_NONE;
-    ssl->pend_alert_level = MBEDTLS_SSL_ALERT_LEVEL_FATAL;
 
     return( 0 );
 
@@ -9832,10 +9831,9 @@
     if( ssl->pend_alert_msg != MBEDTLS_SSL_ALERT_MSG_NONE )
     {
         mbedtls_ssl_send_alert_message( ssl,
-                                        ssl->pend_alert_level,
+                                        MBEDTLS_SSL_ALERT_LEVEL_FATAL,
                                         ssl->pend_alert_msg );
         ssl->pend_alert_msg   = MBEDTLS_SSL_ALERT_MSG_NONE;
-        ssl->pend_alert_level = MBEDTLS_SSL_ALERT_LEVEL_FATAL;
     }
     return( ret );
 }