summaryrefslogtreecommitdiff
path: root/include/openssl
diff options
context:
space:
mode:
authorHugo Landau <hlandau@openssl.org>2023-04-18 19:30:55 +0100
committerHugo Landau <hlandau@openssl.org>2023-05-12 14:47:12 +0100
commit8b7be3aa7e90d85441f5012624cece4dca33291e (patch)
treeb3ae474bb1d4c54264b7cf2e11f10a3e9c13f682 /include/openssl
parent19cb0887722b66e5db7ec0d339526608444a11ef (diff)
downloadopenssl-new-8b7be3aa7e90d85441f5012624cece4dca33291e.tar.gz
QUIC DISPATCH/APL: Implement SSL_set_default_stream_mode, default XSO refactor
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/20765)
Diffstat (limited to 'include/openssl')
-rw-r--r--include/openssl/ssl.h.in8
-rw-r--r--include/openssl/sslerr.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index 8d82bf6b5a..c5ab105816 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -2277,6 +2277,14 @@ __owur int SSL_get_stream_type(SSL *s);
__owur uint64_t SSL_get_stream_id(SSL *s);
+#define SSL_DEFAULT_STREAM_MODE_NONE 0
+#define SSL_DEFAULT_STREAM_MODE_AUTO_BIDI 1
+#define SSL_DEFAULT_STREAM_MODE_AUTO_UNI 2
+__owur int SSL_set_default_stream_mode(SSL *s, uint32_t mode);
+
+__owur SSL *SSL_detach_stream(SSL *s);
+__owur int SSL_attach_stream(SSL *conn, SSL *stream);
+
#define SSL_STREAM_FLAG_UNI (1U << 0)
__owur SSL *SSL_new_stream(SSL *s, uint64_t flags);
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index 94cb60f8be..d8c97c7666 100644
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -202,6 +202,7 @@
# define SSL_R_NO_SHARED_GROUPS 410
# define SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS 376
# define SSL_R_NO_SRTP_PROFILES 359
+# define SSL_R_NO_STREAM 355
# define SSL_R_NO_SUITABLE_DIGEST_ALGORITHM 297
# define SSL_R_NO_SUITABLE_GROUPS 295
# define SSL_R_NO_SUITABLE_KEY_SHARE 101
@@ -353,5 +354,6 @@
# define SSL_R_WRONG_VERSION_NUMBER 267
# define SSL_R_X509_LIB 268
# define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269
+# define SSL_R_CONN_USE_ONLY 411
#endif