summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_server.c
diff options
context:
space:
mode:
authorjsing <>2021-07-01 17:53:39 +0000
committerjsing <>2021-07-01 17:53:39 +0000
commit909a6d9c0830e04a252ab680efffd5246ba048ba (patch)
tree57d97f559edf3211313bbaee593ec7483ded13e4 /src/lib/libssl/tls13_server.c
parentadd9d0d8d906ecd375af373d3858c43e0f44be41 (diff)
downloadopenbsd-909a6d9c0830e04a252ab680efffd5246ba048ba.tar.gz
openbsd-909a6d9c0830e04a252ab680efffd5246ba048ba.tar.bz2
openbsd-909a6d9c0830e04a252ab680efffd5246ba048ba.zip
Merge SSL_METHOD_INTERNAL into SSL_METHOD.
Now that SSL_METHOD is opaque and in internal headers, we can remove SSL_METHOD_INTERNAL by merging it back into SSL_METHOD. ok tb@
Diffstat (limited to 'src/lib/libssl/tls13_server.c')
-rw-r--r--src/lib/libssl/tls13_server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index ff410fbb34..d2c7abbf7c 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.83 2021/06/29 19:20:39 jsing Exp $ */ 1/* $OpenBSD: tls13_server.c,v 1.84 2021/07/01 17:53:39 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>
@@ -282,7 +282,7 @@ tls13_client_hello_recv(struct tls13_ctx *ctx, CBS *cbs)
282 goto err; 282 goto err;
283 283
284 /* See if we switched back to the legacy client method. */ 284 /* See if we switched back to the legacy client method. */
285 if (s->method->internal->version < TLS1_3_VERSION) 285 if (s->method->version < TLS1_3_VERSION)
286 return 1; 286 return 1;
287 287
288 /* 288 /*
@@ -460,7 +460,7 @@ tls13_client_hello_retry_recv(struct tls13_ctx *ctx, CBS *cbs)
460 return 0; 460 return 0;
461 461
462 /* XXX - need further checks. */ 462 /* XXX - need further checks. */
463 if (s->method->internal->version < TLS1_3_VERSION) 463 if (s->method->version < TLS1_3_VERSION)
464 return 0; 464 return 0;
465 465
466 ctx->hs->tls13.hrr = 0; 466 ctx->hs->tls13.hrr = 0;