diff options
author | jsing <> | 2022-01-05 17:10:59 +0000 |
---|---|---|
committer | jsing <> | 2022-01-05 17:10:59 +0000 |
commit | f36e19daf334e48b7b56320dc79438974a09d2e5 (patch) | |
tree | 86cae5bbbd56d7f5ce8b3e863aca6ebb1978830a | |
parent | a9f24628df539c8088b9794446120c0373037961 (diff) | |
download | openbsd-f36e19daf334e48b7b56320dc79438974a09d2e5.tar.gz openbsd-f36e19daf334e48b7b56320dc79438974a09d2e5.tar.bz2 openbsd-f36e19daf334e48b7b56320dc79438974a09d2e5.zip |
Revise for tls13_key_share rename.
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 57fae149d0..24b4e09784 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.55 2021/12/29 22:50:30 tb Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.56 2022/01/05 17:10:59 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> |
@@ -3172,10 +3172,10 @@ test_tlsext_keyshare_client(void) | |||
3172 | if ((ssl = SSL_new(ssl_ctx)) == NULL) | 3172 | if ((ssl = SSL_new(ssl_ctx)) == NULL) |
3173 | errx(1, "failed to create SSL"); | 3173 | errx(1, "failed to create SSL"); |
3174 | 3174 | ||
3175 | if ((S3I(ssl)->hs.tls13.key_share = | 3175 | if ((S3I(ssl)->hs.key_share = |
3176 | tls13_key_share_new_nid(NID_X25519)) == NULL) | 3176 | tls_key_share_new_nid(NID_X25519)) == NULL) |
3177 | errx(1, "failed to create key share"); | 3177 | errx(1, "failed to create key share"); |
3178 | if (!tls13_key_share_generate(S3I(ssl)->hs.tls13.key_share)) | 3178 | if (!tls_key_share_generate(S3I(ssl)->hs.key_share)) |
3179 | errx(1, "failed to generate key share"); | 3179 | errx(1, "failed to generate key share"); |
3180 | 3180 | ||
3181 | S3I(ssl)->hs.our_max_tls_version = TLS1_2_VERSION; | 3181 | S3I(ssl)->hs.our_max_tls_version = TLS1_2_VERSION; |
@@ -3290,20 +3290,20 @@ test_tlsext_keyshare_server(void) | |||
3290 | goto done; | 3290 | goto done; |
3291 | } | 3291 | } |
3292 | 3292 | ||
3293 | if ((S3I(ssl)->hs.tls13.key_share = | 3293 | if ((S3I(ssl)->hs.key_share = |
3294 | tls13_key_share_new_nid(NID_X25519)) == NULL) { | 3294 | tls_key_share_new_nid(NID_X25519)) == NULL) { |
3295 | FAIL("failed to create key share"); | 3295 | FAIL("failed to create key share"); |
3296 | goto done; | 3296 | goto done; |
3297 | } | 3297 | } |
3298 | 3298 | ||
3299 | if (!tls13_key_share_generate(S3I(ssl)->hs.tls13.key_share)) { | 3299 | if (!tls_key_share_generate(S3I(ssl)->hs.key_share)) { |
3300 | FAIL("failed to generate key share"); | 3300 | FAIL("failed to generate key share"); |
3301 | goto done; | 3301 | goto done; |
3302 | } | 3302 | } |
3303 | 3303 | ||
3304 | CBS_init(&cbs, bogokey, sizeof(bogokey)); | 3304 | CBS_init(&cbs, bogokey, sizeof(bogokey)); |
3305 | 3305 | ||
3306 | if (!tls13_key_share_peer_public(S3I(ssl)->hs.tls13.key_share, | 3306 | if (!tls_key_share_peer_public(S3I(ssl)->hs.key_share, |
3307 | 0x001d, &cbs)) { | 3307 | 0x001d, &cbs)) { |
3308 | FAIL("failed to load peer public key\n"); | 3308 | FAIL("failed to load peer public key\n"); |
3309 | goto done; | 3309 | goto done; |
@@ -3325,12 +3325,12 @@ test_tlsext_keyshare_server(void) | |||
3325 | goto done; | 3325 | goto done; |
3326 | } | 3326 | } |
3327 | 3327 | ||
3328 | if ((S3I(ssl)->hs.tls13.key_share = | 3328 | if ((S3I(ssl)->hs.key_share = |
3329 | tls13_key_share_new_nid(NID_X25519)) == NULL) { | 3329 | tls_key_share_new_nid(NID_X25519)) == NULL) { |
3330 | FAIL("failed to create key share"); | 3330 | FAIL("failed to create key share"); |
3331 | goto done; | 3331 | goto done; |
3332 | } | 3332 | } |
3333 | if (!tls13_key_share_generate(S3I(ssl)->hs.tls13.key_share)) { | 3333 | if (!tls_key_share_generate(S3I(ssl)->hs.key_share)) { |
3334 | FAIL("failed to generate key share"); | 3334 | FAIL("failed to generate key share"); |
3335 | goto done; | 3335 | goto done; |
3336 | } | 3336 | } |