Commit d395153746 for openssl.org
commit d3951537462175218d1e8a553e93fffb7cc1facb
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date: Thu Mar 19 21:49:48 2026 +0100
CHANGES.md: remove duplicating "Added support for RFC 8701 GREASE..." entry
A cleanup after merge conflict resolution in a1420a699d25 "Implement RFC 8701
GREASE for TLS ClientHello".
Fixes: a1420a699d25 "Implement RFC 8701 GREASE for TLS ClientHello".
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
MergeDate: Sun Mar 22 01:03:54 2026
(Merged from https://github.com/openssl/openssl/pull/30505)
diff --git a/CHANGES.md b/CHANGES.md
index 6df6c90a67..e7dd11abf0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -74,17 +74,6 @@ OpenSSL Releases
*William McCormack*
-### Changes between 3.6 and 4.0 [xx XXX xxxx]
-
- * Added support for RFC 8701 GREASE (Generate Random Extensions And Sustain
- Extensibility). When `SSL_OP_GREASE` is set, the TLS client injects
- reserved GREASE values into cipher suites, supported versions, supported
- groups, signature algorithms, key share, and extensions in the ClientHello
- to prevent ecosystem ossification. The `openssl s_client` command gains a
- `-grease` option to enable this.
-
- *William McCormack*
-
### Changes between 3.6 and 4.0 [xx XXX xxxx]
* Added `-expected-rpks` option to the `openssl s_client`