summaryrefslogtreecommitdiffstats
path: root/test/clienthellotest.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-02-27 13:02:00 +0000
committerMatt Caswell <matt@openssl.org>2018-03-05 11:39:44 +0000
commitfe93b010e78ab60bc222cf4cbbf3cdfcbecffd91 (patch)
treeba828cb7b1a742f2b320d84343ee96f319a3884a /test/clienthellotest.c
parent0e1d6ecf37ea33ad963249cdb5efebeb04299033 (diff)
Update tests for TLS Ed448
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Kurt Roeckx <kurt@roeckx.be> (Merged from https://github.com/openssl/openssl/pull/5470)
Diffstat (limited to 'test/clienthellotest.c')
-rw-r--r--test/clienthellotest.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/test/clienthellotest.c b/test/clienthellotest.c
index 4f6bd40c9b..5cff519ead 100644
--- a/test/clienthellotest.c
+++ b/test/clienthellotest.c
@@ -111,12 +111,19 @@ static int test_client_hello(int currtest)
* F5_WORKAROUND_MIN_MSG_LEN bytes long - meaning padding will be
* needed.
*/
- if (currtest == TEST_ADD_PADDING
- && (!TEST_false(SSL_CTX_set_alpn_protos(ctx,
+ if (currtest == TEST_ADD_PADDING) {
+ if (!TEST_false(SSL_CTX_set_alpn_protos(ctx,
(unsigned char *)alpn_prots,
- sizeof(alpn_prots) - 1))))
+ sizeof(alpn_prots) - 1)))
+ goto end;
+ /*
+ * Otherwise we need to make sure we have a small enough message to
+ * not need padding.
+ */
+ } else if (!TEST_true(SSL_CTX_set_cipher_list(ctx,
+ "AES128-SHA:TLS13-AES-128-GCM-SHA256"))) {
goto end;
-
+ }
break;
default: