Rebase and fix some test failures

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 4571ada..714acb9 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -1326,13 +1326,12 @@
 {
     int ret = 0;
     size_t selected_identity;
-    int psk_type;
 
+    int psk_type;
     const unsigned char *psk;
     size_t psk_len;
     const unsigned char *psk_identity;
     size_t psk_identity_len;
-    int psk_type;
 
     /* Check which PSK we've offered.
      *