From 3b5873567d24bf0d8bc2a175848e716e295d6c94 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 14 Nov 2017 14:21:13 +0000 Subject: [PATCH] Provide a more information early_data message in s_server s_server reported early_data not being sent and early_data being rejected in the same way, i.e. "No early data received". This is slightly misleading so this commit provides a different error message if the early data is rejected. Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/4738) --- apps/s_server.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/s_server.c b/apps/s_server.c index 86fed6f593..5095bab4d3 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2340,10 +2340,14 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) (void)BIO_flush(bio_s_out); } } - if (write_header) - BIO_printf(bio_s_out, "No early data received\n"); - else + if (write_header) { + if (SSL_get_early_data_status(con) == SSL_EARLY_DATA_NOT_SENT) + BIO_printf(bio_s_out, "No early data received\n"); + else + BIO_printf(bio_s_out, "Early data was rejected\n"); + } else { BIO_printf(bio_s_out, "\nEnd of early data\n"); + } if (SSL_is_init_finished(con)) print_connection_info(con); } -- 2.34.1