commit add8d0e9e0bb80728f4b89d15573bf2e70596ceb
author Matt Caswell <matt@openssl.org> Wed Jul 05 20:53:03 2017 +0100
committer Matt Caswell <matt@openssl.org> Thu Aug 31 15:02:22 2017 +0100
tree 6cae02f58f6a3996a1288bedf14183d6a408dec8
parent 177503752b24299cc97ccf07062a3b79c4f28899

Enable the ability to use an external PSK for sending early_data

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3926)

apps/s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index 5a4a2f6..36da3b6 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2600,8 +2600,10 @@
     }
 
     if (early_data_file != NULL
-            && SSL_get0_session(con) != NULL
-            && SSL_SESSION_get_max_early_data(SSL_get0_session(con)) > 0) {
+            && ((SSL_get0_session(con) != NULL
+                 && SSL_SESSION_get_max_early_data(SSL_get0_session(con)) > 0)
+                || (psksess != NULL
+                    && SSL_SESSION_get_max_early_data(psksess) > 0))) {
         BIO *edfile = BIO_new_file(early_data_file, "r");
         size_t readbytes, writtenbytes;
         int finish = 0;