diff options
author | jsing <> | 2024-07-22 14:50:45 +0000 |
---|---|---|
committer | jsing <> | 2024-07-22 14:50:45 +0000 |
commit | 9d00569d89dbe870d2bc630ceb14e42ee1807ec5 (patch) | |
tree | 5cff81d1024cb3a06f953c3066b0a90d96f5a5e9 /src/regress/lib/libssl/tlsext/tlsexttest.c | |
parent | 4fbee6b90386fa14be274db8ba947f951bc6de4c (diff) | |
download | openbsd-9d00569d89dbe870d2bc630ceb14e42ee1807ec5.tar.gz openbsd-9d00569d89dbe870d2bc630ceb14e42ee1807ec5.tar.bz2 openbsd-9d00569d89dbe870d2bc630ceb14e42ee1807ec5.zip |
Revise regress to match cipher suite values change.
Diffstat (limited to 'src/regress/lib/libssl/tlsext/tlsexttest.c')
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 18e800031a..d5c8840e24 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.90 2024/03/30 09:53:41 tb Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.91 2024/07/22 14:50:45 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> |
@@ -1151,9 +1151,7 @@ test_tlsext_ecpf_server(void) | |||
1151 | errx(1, "failed to create session"); | 1151 | errx(1, "failed to create session"); |
1152 | 1152 | ||
1153 | /* Setup the state so we can call needs. */ | 1153 | /* Setup the state so we can call needs. */ |
1154 | if ((ssl->s3->hs.cipher = | 1154 | if ((ssl->s3->hs.cipher = ssl3_get_cipher_by_value(0xcca9)) == NULL) { |
1155 | ssl3_get_cipher_by_id(TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305)) | ||
1156 | == NULL) { | ||
1157 | FAIL("server cannot find cipher\n"); | 1155 | FAIL("server cannot find cipher\n"); |
1158 | goto err; | 1156 | goto err; |
1159 | } | 1157 | } |
@@ -3362,8 +3360,7 @@ test_tlsext_serverhello_build(void) | |||
3362 | 3360 | ||
3363 | ssl->s3->hs.our_max_tls_version = TLS1_3_VERSION; | 3361 | ssl->s3->hs.our_max_tls_version = TLS1_3_VERSION; |
3364 | ssl->s3->hs.negotiated_tls_version = TLS1_3_VERSION; | 3362 | ssl->s3->hs.negotiated_tls_version = TLS1_3_VERSION; |
3365 | ssl->s3->hs.cipher = | 3363 | ssl->s3->hs.cipher = ssl3_get_cipher_by_value(0x003c); |
3366 | ssl3_get_cipher_by_id(TLS1_CK_RSA_WITH_AES_128_SHA256); | ||
3367 | 3364 | ||
3368 | if (!tlsext_server_build(ssl, SSL_TLSEXT_MSG_SH, &cbb)) { | 3365 | if (!tlsext_server_build(ssl, SSL_TLSEXT_MSG_SH, &cbb)) { |
3369 | FAIL("failed to build serverhello extensions\n"); | 3366 | FAIL("failed to build serverhello extensions\n"); |
@@ -3397,8 +3394,7 @@ test_tlsext_serverhello_build(void) | |||
3397 | 3394 | ||
3398 | /* Turn a few things on so we get extensions... */ | 3395 | /* Turn a few things on so we get extensions... */ |
3399 | ssl->s3->send_connection_binding = 1; | 3396 | ssl->s3->send_connection_binding = 1; |
3400 | ssl->s3->hs.cipher = | 3397 | ssl->s3->hs.cipher = ssl3_get_cipher_by_value(0xc027); |
3401 | ssl3_get_cipher_by_id(TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256); | ||
3402 | ssl->tlsext_status_expected = 1; | 3398 | ssl->tlsext_status_expected = 1; |
3403 | ssl->tlsext_ticket_expected = 1; | 3399 | ssl->tlsext_ticket_expected = 1; |
3404 | if ((ssl->session->tlsext_ecpointformatlist = malloc(1)) == NULL) { | 3400 | if ((ssl->session->tlsext_ecpointformatlist = malloc(1)) == NULL) { |