From: Peter Wu <peter@lekensteyn.nl>
Date: Wed, 21 Mar 2018 18:44:44 +0000 (+0100)
Subject: test: Remove redundant SSL_CTX_set_max_early_data
X-Git-Tag: OpenSSL_1_1_1-pre6~95
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=d4da95a7736e9e74ec47f9e0077ad0ef18a4faf6

test: Remove redundant SSL_CTX_set_max_early_data

Client can only send early data if the PSK allows for it, the
max_early_data_size field can only be configured for the server side.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5702)
---

diff --git a/test/sslapitest.c b/test/sslapitest.c
index e97b228696..5fef058dfc 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -382,8 +382,6 @@ static int test_keylog_no_master_key(void)
                                        TLS1_VERSION, TLS_MAX_VERSION,
                                        &sctx, &cctx, cert, privkey))
         || !TEST_true(SSL_CTX_set_max_early_data(sctx,
-                                                 SSL3_RT_MAX_PLAIN_LENGTH))
-        || !TEST_true(SSL_CTX_set_max_early_data(cctx,
                                                  SSL3_RT_MAX_PLAIN_LENGTH)))
         return 0;
 
@@ -1706,8 +1704,6 @@ static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
                                        TLS1_VERSION, TLS_MAX_VERSION,
                                        sctx, cctx, cert, privkey))
         || !TEST_true(SSL_CTX_set_max_early_data(*sctx,
-                                                 SSL3_RT_MAX_PLAIN_LENGTH))
-        || !TEST_true(SSL_CTX_set_max_early_data(*cctx,
                                                  SSL3_RT_MAX_PLAIN_LENGTH)))
         return 0;
 
diff --git a/test/tls13ccstest.c b/test/tls13ccstest.c
index 41e4896fa9..25dc8192c5 100644
--- a/test/tls13ccstest.c
+++ b/test/tls13ccstest.c
@@ -258,8 +258,6 @@ static int test_tls13ccs(int tst)
                                        TLS1_VERSION, TLS_MAX_VERSION,
                                        &sctx, &cctx, cert, privkey))
         || !TEST_true(SSL_CTX_set_max_early_data(sctx,
-                                                 SSL3_RT_MAX_PLAIN_LENGTH))
-        || !TEST_true(SSL_CTX_set_max_early_data(cctx,
                                                  SSL3_RT_MAX_PLAIN_LENGTH)))
         goto err;