summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_tlsext.c
diff options
context:
space:
mode:
authortb <>2022-07-02 16:31:04 +0000
committertb <>2022-07-02 16:31:04 +0000
commit5d994915db5d0a0615b6618184d705dbf25a7473 (patch)
treebc3bde853323758696c370e558e602d43422a86d /src/lib/libssl/ssl_tlsext.c
parentb6005b83ccc59320a316c38108b7b45ca4682fbd (diff)
downloadopenbsd-5d994915db5d0a0615b6618184d705dbf25a7473.tar.gz
openbsd-5d994915db5d0a0615b6618184d705dbf25a7473.tar.bz2
openbsd-5d994915db5d0a0615b6618184d705dbf25a7473.zip
Stop using ssl{_ctx,}_security() outside of ssl_seclevel.c
The API is ugly and we can easily abstract it away. The SSL_SECOP_* stuff is now confined into ssl_seclevel.c and the rest of the library can make use of the more straightforward wrappers, which makes it a lot easier on the eyes. ok beck jsing
Diffstat (limited to 'src/lib/libssl/ssl_tlsext.c')
-rw-r--r--src/lib/libssl/ssl_tlsext.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c
index 7457925572..fa1eef3587 100644
--- a/src/lib/libssl/ssl_tlsext.c
+++ b/src/lib/libssl/ssl_tlsext.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_tlsext.c,v 1.118 2022/07/02 16:00:12 tb Exp $ */ 1/* $OpenBSD: ssl_tlsext.c,v 1.119 2022/07/02 16:31:04 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> 4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -1126,7 +1126,7 @@ tlsext_sessionticket_client_needs(SSL *s, uint16_t msg_type)
1126 if ((SSL_get_options(s) & SSL_OP_NO_TICKET) != 0) 1126 if ((SSL_get_options(s) & SSL_OP_NO_TICKET) != 0)
1127 return 0; 1127 return 0;
1128 1128
1129 if (!ssl_security(s, SSL_SECOP_TICKET, 0, 0, NULL)) 1129 if (!ssl_security_tickets(s))
1130 return 0; 1130 return 0;
1131 1131
1132 if (s->internal->new_session) 1132 if (s->internal->new_session)
@@ -1209,7 +1209,7 @@ tlsext_sessionticket_server_needs(SSL *s, uint16_t msg_type)
1209{ 1209{
1210 return (s->internal->tlsext_ticket_expected && 1210 return (s->internal->tlsext_ticket_expected &&
1211 !(SSL_get_options(s) & SSL_OP_NO_TICKET) && 1211 !(SSL_get_options(s) & SSL_OP_NO_TICKET) &&
1212 ssl_security(s, SSL_SECOP_TICKET, 0, 0, NULL)); 1212 ssl_security_tickets(s));
1213} 1213}
1214 1214
1215int 1215int