summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Minichmayr <markus@tapkey.com>2023-11-22 17:43:27 +0100
committerMatt Caswell <matt@openssl.org>2023-11-24 15:08:04 +0000
commitdfc836c346cc6001534eaf9ed3a151b7aa658335 (patch)
tree893f0624866392208f99f2aaa56c26241c6360eb
parent55d894bbfbb992482d4fbeac3b03f3bb5b2b258b (diff)
PreferNoDHEKEX changelog and history anticipating inclusion in OpenSSL version 3.3.
Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22794)
-rw-r--r--CHANGES.md6
-rw-r--r--doc/man3/SSL_CONF_cmd.pod2
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 81044b3d70..93365619fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -45,6 +45,12 @@ OpenSSL 3.3
*Ahelenia ZiemiaƄska*
+ * New option `SSL_OP_PREFER_NO_DHE_KEX`, which allows configuring a TLS1.3
+ server to prefer session resumption using PSK-only key exchange over PSK
+ with DHE, if both are available.
+
+ *Markus Minichmayr, Tapkey GmbH*
+
OpenSSL 3.2
-----------
diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod
index a0e4d52892..54ab886af1 100644
--- a/doc/man3/SSL_CONF_cmd.pod
+++ b/doc/man3/SSL_CONF_cmd.pod
@@ -789,6 +789,8 @@ OpenSSL 3.0.
The B<TxCertificateCompression> and B<RxCertificateCompression> options were
added in OpenSSL 3.2.
+B<PreferNoDHEKEX> was added in OpenSSL 3.3.
+
=head1 COPYRIGHT
Copyright 2012-2023 The OpenSSL Project Authors. All Rights Reserved.