diff options
Diffstat (limited to 'src/lib/libssl/tls13_server.c')
| -rw-r--r-- | src/lib/libssl/tls13_server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c index 658aef2cfe..bac9623a15 100644 --- a/src/lib/libssl/tls13_server.c +++ b/src/lib/libssl/tls13_server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_server.c,v 1.72 2021/03/21 18:36:34 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_server.c,v 1.73 2021/03/24 18:44:00 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> |
| 4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
| @@ -249,7 +249,7 @@ tls13_client_hello_process(struct tls13_ctx *ctx, CBS *cbs) | |||
| 249 | ctx->alert = TLS13_ALERT_HANDSHAKE_FAILURE; | 249 | ctx->alert = TLS13_ALERT_HANDSHAKE_FAILURE; |
| 250 | goto err; | 250 | goto err; |
| 251 | } | 251 | } |
| 252 | ctx->hs->new_cipher = cipher; | 252 | ctx->hs->cipher = cipher; |
| 253 | 253 | ||
| 254 | sk_SSL_CIPHER_free(s->session->ciphers); | 254 | sk_SSL_CIPHER_free(s->session->ciphers); |
| 255 | s->session->ciphers = ciphers; | 255 | s->session->ciphers = ciphers; |
| @@ -314,7 +314,7 @@ tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb, int hrr) | |||
| 314 | SSL *s = ctx->ssl; | 314 | SSL *s = ctx->ssl; |
| 315 | uint16_t cipher; | 315 | uint16_t cipher; |
| 316 | 316 | ||
| 317 | cipher = SSL_CIPHER_get_value(ctx->hs->new_cipher); | 317 | cipher = SSL_CIPHER_get_value(ctx->hs->cipher); |
| 318 | server_random = s->s3->server_random; | 318 | server_random = s->s3->server_random; |
| 319 | 319 | ||
| 320 | if (hrr) { | 320 | if (hrr) { |
| @@ -362,11 +362,11 @@ tls13_server_engage_record_protection(struct tls13_ctx *ctx) | |||
| 362 | &shared_key, &shared_key_len)) | 362 | &shared_key, &shared_key_len)) |
| 363 | goto err; | 363 | goto err; |
| 364 | 364 | ||
| 365 | s->session->cipher = ctx->hs->new_cipher; | 365 | s->session->cipher = ctx->hs->cipher; |
| 366 | 366 | ||
| 367 | if ((ctx->aead = tls13_cipher_aead(ctx->hs->new_cipher)) == NULL) | 367 | if ((ctx->aead = tls13_cipher_aead(ctx->hs->cipher)) == NULL) |
| 368 | goto err; | 368 | goto err; |
| 369 | if ((ctx->hash = tls13_cipher_hash(ctx->hs->new_cipher)) == NULL) | 369 | if ((ctx->hash = tls13_cipher_hash(ctx->hs->cipher)) == NULL) |
| 370 | goto err; | 370 | goto err; |
| 371 | 371 | ||
| 372 | if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL) | 372 | if ((secrets = tls13_secrets_create(ctx->hash, 0)) == NULL) |
