From: jsing <jsing@openbsd.org>
Date: Sun, 21 Aug 2022 17:54:38 +0000 (+0000)
Subject: Prepare to provide SSL_ERROR_WANT_{ASYNC,ASYNC_JOB,CLIENT_HELLO_CB}
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1fd51421efdf52c67ac3371d4c0c3858e09d6c96;p=openbsd

Prepare to provide SSL_ERROR_WANT_{ASYNC,ASYNC_JOB,CLIENT_HELLO_CB}

LibreSSL will not return these values, however software is starting to
check for these as return values from SSL_get_error().

ok tb@
---

diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index e649a6972ee..7ce873de3f2 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.223 2022/08/17 18:43:17 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.224 2022/08/21 17:54:38 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -823,15 +823,20 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x);
 /* Offset to get an SSL_R_... value from an SSL_AD_... value. */
 #define SSL_AD_REASON_OFFSET			1000
 
-#define SSL_ERROR_NONE			0
-#define SSL_ERROR_SSL			1
-#define SSL_ERROR_WANT_READ		2
-#define SSL_ERROR_WANT_WRITE		3
-#define SSL_ERROR_WANT_X509_LOOKUP	4
-#define SSL_ERROR_SYSCALL		5 /* look at error stack/return value/errno */
-#define SSL_ERROR_ZERO_RETURN		6
-#define SSL_ERROR_WANT_CONNECT		7
-#define SSL_ERROR_WANT_ACCEPT		8
+#define SSL_ERROR_NONE				0
+#define SSL_ERROR_SSL				1
+#define SSL_ERROR_WANT_READ			2
+#define SSL_ERROR_WANT_WRITE			3
+#define SSL_ERROR_WANT_X509_LOOKUP		4
+#define SSL_ERROR_SYSCALL			5
+#define SSL_ERROR_ZERO_RETURN			6
+#define SSL_ERROR_WANT_CONNECT			7
+#define SSL_ERROR_WANT_ACCEPT			8
+#if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
+#define SSL_ERROR_WANT_ASYNC			9
+#define SSL_ERROR_WANT_ASYNC_JOB		10
+#define SSL_ERROR_WANT_CLIENT_HELLO_CB		11
+#endif
 
 #define SSL_CTRL_NEED_TMP_RSA			1
 #define SSL_CTRL_SET_TMP_RSA			2