From 1530e958f4366f0b67d319bf3310b72cb2ddcbda Mon Sep 17 00:00:00 2001 From: jsing <> Date: Wed, 24 Mar 2021 19:02:35 +0000 Subject: Update regress for new_cipher rename. --- src/regress/lib/libssl/tlsext/tlsexttest.c | 8 ++++---- src/regress/lib/libssl/unit/tls_prf.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 562e3edca5..a2a37f5854 100644 --- a/src/regress/lib/libssl/tlsext/tlsexttest.c +++ b/src/regress/lib/libssl/tlsext/tlsexttest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tlsexttest.c,v 1.47 2021/03/21 18:37:26 jsing Exp $ */ +/* $OpenBSD: tlsexttest.c,v 1.48 2021/03/24 19:02:35 jsing Exp $ */ /* * Copyright (c) 2017 Joel Sing * Copyright (c) 2017 Doug Hogan @@ -1064,7 +1064,7 @@ test_tlsext_ecpf_server(void) errx(1, "failed to create session"); /* Setup the state so we can call needs. */ - if ((S3I(ssl)->hs.new_cipher = + if ((S3I(ssl)->hs.cipher = ssl3_get_cipher_by_id(TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305)) == NULL) { FAIL("server cannot find cipher\n"); @@ -2851,7 +2851,7 @@ test_tlsext_serverhello_build(void) S3I(ssl)->hs.our_max_tls_version = TLS1_3_VERSION; S3I(ssl)->hs.negotiated_tls_version = TLS1_3_VERSION; - S3I(ssl)->hs.new_cipher = + S3I(ssl)->hs.cipher = ssl3_get_cipher_by_id(TLS1_CK_RSA_WITH_AES_128_SHA256); if (!tlsext_server_build(ssl, SSL_TLSEXT_MSG_SH, &cbb)) { @@ -2881,7 +2881,7 @@ test_tlsext_serverhello_build(void) /* Turn a few things on so we get extensions... */ S3I(ssl)->send_connection_binding = 1; - S3I(ssl)->hs.new_cipher = + S3I(ssl)->hs.cipher = ssl3_get_cipher_by_id(TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256); ssl->internal->tlsext_status_expected = 1; ssl->internal->tlsext_ticket_expected = 1; diff --git a/src/regress/lib/libssl/unit/tls_prf.c b/src/regress/lib/libssl/unit/tls_prf.c index 2eacb12af3..9e8f5b4053 100644 --- a/src/regress/lib/libssl/unit/tls_prf.c +++ b/src/regress/lib/libssl/unit/tls_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_prf.c,v 1.4 2017/05/06 22:24:58 beck Exp $ */ +/* $OpenBSD: tls_prf.c,v 1.5 2021/03/24 19:02:35 jsing Exp $ */ /* * Copyright (c) 2017 Joel Sing * @@ -197,7 +197,7 @@ do_tls_prf_test(int test_no, struct tls_prf_test *tpt) goto failure; } - S3I(ssl)->hs.new_cipher = cipher; + S3I(ssl)->hs.cipher = cipher; for (len = 1; len <= TLS_PRF_OUT_LEN; len++) { memset(out, 'A', TLS_PRF_OUT_LEN); -- cgit v1.2.3-55-g6feb