commit d0b66d08bb4beb721b2e6ccff4f4aaf172006126
author Hanno Becker <hanno.becker@arm.com> Fri Jul 26 08:07:03 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Wed Aug 14 15:08:08 2019 +0100
tree d9568e029c9eef4e8468276a23afe4fcd3990988
parent 9eca2767688c2982a457e0525f06d89b564ae1f0

Don't use memcpy() for 2-byte copy operation

Manual copying is slightly shorter here.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 102a13f..3e0552c 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5056,13 +5056,11 @@
      * Parse and validate record version
      */
 
-    memcpy( &rec->ver[0],
-            buf + rec_hdr_version_offset,
-            rec_hdr_version_len );
-
+    rec->ver[0] = buf[ rec_hdr_version_offset + 0 ];
+    rec->ver[1] = buf[ rec_hdr_version_offset + 1 ];
     mbedtls_ssl_read_version( &major_ver, &minor_ver,
                               ssl->conf->transport,
-                              buf + rec_hdr_version_offset );
+                              &rec->ver[0] );
 
     if( major_ver != ssl->major_ver )
     {