summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_internal.h
diff options
context:
space:
mode:
authorbeck <>2020-01-24 04:36:29 +0000
committerbeck <>2020-01-24 04:36:29 +0000
commit9bdb8cf2b0cdef5430b92da746812d02b3e4a0db (patch)
tree1e380b51c8b8b1ef639f72f8967a2a3aab5f9349 /src/lib/libssl/tls13_internal.h
parent7136a54d43d7b515b6d9043faeb359a87cf1ab0f (diff)
downloadopenbsd-9bdb8cf2b0cdef5430b92da746812d02b3e4a0db.tar.gz
openbsd-9bdb8cf2b0cdef5430b92da746812d02b3e4a0db.tar.bz2
openbsd-9bdb8cf2b0cdef5430b92da746812d02b3e4a0db.zip
Fix breakage in SSL_connect, SSL_accept, etc. by not propagating
new retry conditions from the record layer all the way up to the callers. Instead we catch them at the top of the record layer and retry the operations, unless we actually got a retry indicated from actual IO operations. ok jsing@ tb@
Diffstat (limited to 'src/lib/libssl/tls13_internal.h')
-rw-r--r--src/lib/libssl/tls13_internal.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/tls13_internal.h b/src/lib/libssl/tls13_internal.h
index e9f629f387..7b3670bf45 100644
--- a/src/lib/libssl/tls13_internal.h
+++ b/src/lib/libssl/tls13_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_internal.h,v 1.50 2020/01/23 11:57:20 jsing Exp $ */ 1/* $OpenBSD: tls13_internal.h,v 1.51 2020/01/24 04:36:29 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2018 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
4 * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> 4 * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
@@ -36,7 +36,8 @@ __BEGIN_HIDDEN_DECLS
36#define TLS13_IO_ALERT -2 36#define TLS13_IO_ALERT -2
37#define TLS13_IO_WANT_POLLIN -3 37#define TLS13_IO_WANT_POLLIN -3
38#define TLS13_IO_WANT_POLLOUT -4 38#define TLS13_IO_WANT_POLLOUT -4
39#define TLS13_IO_USE_LEGACY -5 39#define TLS13_IO_WANT_RETRY -5 /* Retry the previous call immediately. */
40#define TLS13_IO_USE_LEGACY -6
40 41
41#define TLS13_ERR_VERIFY_FAILED 16 42#define TLS13_ERR_VERIFY_FAILED 16
42#define TLS13_ERR_HRR_FAILED 17 43#define TLS13_ERR_HRR_FAILED 17