commit daddfb520d5b9113b5c73dc10c435817abe2287b
author Xiaokang Qian <xiaokang.qian@arm.com> Thu Dec 07 08:14:30 2023 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Thu Dec 07 08:14:30 2023 +0000
tree e42f5bf45413671418bdf51f8e3b796c93e6d6c1
parent 864c62a906b4df17e1db10156ca225067c530229

Open the file once read in the file path

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index cdc4352..dfae745 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1217,6 +1217,12 @@
             }
         } else if (strcmp(p, "early_data_file") == 0) {
             opt.early_data_file = q;
+            if ((early_data_fp = fopen(opt.early_data_file, "rb")) == NULL) {
+                mbedtls_printf("failed\n  ! Cannot open '%s' for reading.\n",
+                               opt.early_data_file);
+                ret = MBEDTLS_ERR_SSL_INTERNAL_ERROR;
+                goto exit;
+            }
         }
 #endif /* MBEDTLS_SSL_EARLY_DATA */
 
@@ -3007,25 +3013,6 @@
                            (unsigned int) -ret);
             goto exit;
         }
-#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_EARLY_DATA)
-        if (opt.early_data == MBEDTLS_SSL_EARLY_DATA_ENABLED
-            && strlen(opt.early_data_file) > 0) {
-            if ((early_data_fp = fopen(opt.early_data_file, "rb")) == NULL) {
-                mbedtls_printf("failed\n  ! Cannot open '%s' for reading.\n",
-                               opt.early_data_file);
-                ret = MBEDTLS_ERR_SSL_INTERNAL_ERROR;
-                goto exit;
-            }
-
-            mbedtls_printf("Read early data successfully...");
-
-            /* TODO: read the early data from early_data_fp in chunks, and call
-             * mbedtls_ssl_write_early_data() to initial the handshake and send
-             * out the early data. Then finish the handshake.
-             */
-
-        } else
-#endif
 
         while ((ret = mbedtls_ssl_handshake(&ssl)) != 0) {
             if (ret != MBEDTLS_ERR_SSL_WANT_READ &&