diff options
author | jsing <> | 2021-03-24 19:02:35 +0000 |
---|---|---|
committer | jsing <> | 2021-03-24 19:02:35 +0000 |
commit | 1530e958f4366f0b67d319bf3310b72cb2ddcbda (patch) | |
tree | bbd4d4c087a0e384a5299dd27e5548d49b67e3bf /src/regress/lib | |
parent | ae1702cd90dfc51fd5483baea6488cd99ac9c26b (diff) | |
download | openbsd-1530e958f4366f0b67d319bf3310b72cb2ddcbda.tar.gz openbsd-1530e958f4366f0b67d319bf3310b72cb2ddcbda.tar.bz2 openbsd-1530e958f4366f0b67d319bf3310b72cb2ddcbda.zip |
Update regress for new_cipher rename.
Diffstat (limited to 'src/regress/lib')
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 8 | ||||
-rw-r--r-- | src/regress/lib/libssl/unit/tls_prf.c | 4 |
2 files changed, 6 insertions, 6 deletions
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 @@ | |||
1 | /* $OpenBSD: tlsexttest.c,v 1.47 2021/03/21 18:37:26 jsing Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.48 2021/03/24 19:02:35 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -1064,7 +1064,7 @@ test_tlsext_ecpf_server(void) | |||
1064 | errx(1, "failed to create session"); | 1064 | errx(1, "failed to create session"); |
1065 | 1065 | ||
1066 | /* Setup the state so we can call needs. */ | 1066 | /* Setup the state so we can call needs. */ |
1067 | if ((S3I(ssl)->hs.new_cipher = | 1067 | if ((S3I(ssl)->hs.cipher = |
1068 | ssl3_get_cipher_by_id(TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305)) | 1068 | ssl3_get_cipher_by_id(TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305)) |
1069 | == NULL) { | 1069 | == NULL) { |
1070 | FAIL("server cannot find cipher\n"); | 1070 | FAIL("server cannot find cipher\n"); |
@@ -2851,7 +2851,7 @@ test_tlsext_serverhello_build(void) | |||
2851 | 2851 | ||
2852 | S3I(ssl)->hs.our_max_tls_version = TLS1_3_VERSION; | 2852 | S3I(ssl)->hs.our_max_tls_version = TLS1_3_VERSION; |
2853 | S3I(ssl)->hs.negotiated_tls_version = TLS1_3_VERSION; | 2853 | S3I(ssl)->hs.negotiated_tls_version = TLS1_3_VERSION; |
2854 | S3I(ssl)->hs.new_cipher = | 2854 | S3I(ssl)->hs.cipher = |
2855 | ssl3_get_cipher_by_id(TLS1_CK_RSA_WITH_AES_128_SHA256); | 2855 | ssl3_get_cipher_by_id(TLS1_CK_RSA_WITH_AES_128_SHA256); |
2856 | 2856 | ||
2857 | if (!tlsext_server_build(ssl, SSL_TLSEXT_MSG_SH, &cbb)) { | 2857 | if (!tlsext_server_build(ssl, SSL_TLSEXT_MSG_SH, &cbb)) { |
@@ -2881,7 +2881,7 @@ test_tlsext_serverhello_build(void) | |||
2881 | 2881 | ||
2882 | /* Turn a few things on so we get extensions... */ | 2882 | /* Turn a few things on so we get extensions... */ |
2883 | S3I(ssl)->send_connection_binding = 1; | 2883 | S3I(ssl)->send_connection_binding = 1; |
2884 | S3I(ssl)->hs.new_cipher = | 2884 | S3I(ssl)->hs.cipher = |
2885 | ssl3_get_cipher_by_id(TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256); | 2885 | ssl3_get_cipher_by_id(TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256); |
2886 | ssl->internal->tlsext_status_expected = 1; | 2886 | ssl->internal->tlsext_status_expected = 1; |
2887 | ssl->internal->tlsext_ticket_expected = 1; | 2887 | 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 @@ | |||
1 | /* $OpenBSD: tls_prf.c,v 1.4 2017/05/06 22:24:58 beck Exp $ */ | 1 | /* $OpenBSD: tls_prf.c,v 1.5 2021/03/24 19:02:35 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -197,7 +197,7 @@ do_tls_prf_test(int test_no, struct tls_prf_test *tpt) | |||
197 | goto failure; | 197 | goto failure; |
198 | } | 198 | } |
199 | 199 | ||
200 | S3I(ssl)->hs.new_cipher = cipher; | 200 | S3I(ssl)->hs.cipher = cipher; |
201 | 201 | ||
202 | for (len = 1; len <= TLS_PRF_OUT_LEN; len++) { | 202 | for (len = 1; len <= TLS_PRF_OUT_LEN; len++) { |
203 | memset(out, 'A', TLS_PRF_OUT_LEN); | 203 | memset(out, 'A', TLS_PRF_OUT_LEN); |