commit a89610aaf2dd2d78c87f2114b61200b4beb27977
author Hanno Becker <hanno.becker@arm.com> Thu Jul 11 13:07:45 2019 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Aug 01 09:51:52 2019 +0200
tree 0fa5dc15b337b26d6c2a5c05b92ed96aaa3470cc
parent 9babbf7e752ae1ce921936a545b2b21c5e46fa9a

Adapt ssl_prepare_record_content() to use SSL record structure

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 2bd621f..69ba0db 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4991,12 +4991,13 @@
 /*
  * If applicable, decrypt (and decompress) record content
  */
-static int ssl_prepare_record_content( mbedtls_ssl_context *ssl )
+static int ssl_prepare_record_content( mbedtls_ssl_context *ssl,
+                                       mbedtls_record *rec )
 {
     int ret, done = 0;
 
     MBEDTLS_SSL_DEBUG_BUF( 4, "input record from network",
-                   ssl->in_hdr, mbedtls_ssl_in_hdr_len( ssl ) + ssl->in_msglen );
+                           rec->buf, rec->buf_len );
 
 #if defined(MBEDTLS_SSL_HW_RECORD_ACCEL)
     if( mbedtls_ssl_hw_record_read != NULL )
@@ -5016,25 +5017,8 @@
 #endif /* MBEDTLS_SSL_HW_RECORD_ACCEL */
     if( !done && ssl->transform_in != NULL )
     {
-        mbedtls_record rec;
-
-        rec.buf         = ssl->in_iv;
-        rec.buf_len     = MBEDTLS_SSL_IN_BUFFER_LEN
-            - ( ssl->in_iv - ssl->in_buf );
-        rec.data_len    = ssl->in_msglen;
-        rec.data_offset = 0;
-#if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID )
-        rec.cid_len     = (uint8_t)( ssl->in_len - ssl->in_cid );
-        memcpy( rec.cid, ssl->in_cid, rec.cid_len );
-#endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */
-
-        memcpy( &rec.ctr[0], ssl->in_ctr, 8 );
-        mbedtls_ssl_write_version( mbedtls_ssl_get_major_ver( ssl ),
-                                   mbedtls_ssl_get_minor_ver( ssl ),
-                                   ssl->conf->transport, rec.ver );
-        rec.type = ssl->in_msgtype;
         if( ( ret = mbedtls_ssl_decrypt_buf( ssl, ssl->transform_in,
-                                             &rec ) ) != 0 )
+                                             rec ) ) != 0 )
         {
             MBEDTLS_SSL_DEBUG_RET( 1, "ssl_decrypt_buf", ret );
 
@@ -5051,24 +5035,24 @@
             return( ret );
         }
 
-        if( ssl->in_msgtype != rec.type )
+        if( ssl->in_msgtype != rec->type )
         {
             MBEDTLS_SSL_DEBUG_MSG( 4, ( "record type after decrypt (before %d): %d",
-                                        ssl->in_msgtype, rec.type ) );
+                                        ssl->in_msgtype, rec->type ) );
         }
 
         /* The record content type may change during decryption,
          * so re-read it. */
-        ssl->in_msgtype = rec.type;
+        ssl->in_msgtype = rec->type;
         /* Also update the input buffer, because unfortunately
          * the server-side ssl_parse_client_hello() reparses the
          * record header when receiving a ClientHello initiating
          * a renegotiation. */
-        ssl->in_hdr[0] = rec.type;
-        ssl->in_msg    = rec.buf + rec.data_offset;
-        ssl->in_msglen = rec.data_len;
-        ssl->in_len[0] = (unsigned char)( rec.data_len >> 8 );
-        ssl->in_len[1] = (unsigned char)( rec.data_len      );
+        ssl->in_hdr[0] = rec->type;
+        ssl->in_msg    = rec->buf + rec->data_offset;
+        ssl->in_msglen = rec->data_len;
+        ssl->in_len[0] = (unsigned char)( rec->data_len >> 8 );
+        ssl->in_len[1] = (unsigned char)( rec->data_len      );
 
         MBEDTLS_SSL_DEBUG_BUF( 4, "input payload after decrypt",
                        ssl->in_msg, ssl->in_msglen );
@@ -5946,7 +5930,7 @@
      * Decrypt record contents.
      */
 
-    if( ( ret = ssl_prepare_record_content( ssl ) ) != 0 )
+    if( ( ret = ssl_prepare_record_content( ssl, &rec ) ) != 0 )
     {
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
         if( MBEDTLS_SSL_TRANSPORT_IS_DTLS( ssl->conf->transport ) )