From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Fri, 2 Sep 2022 14:16:56 +0000 (+0000)
Subject: Prep for 5.7 (#1131)
X-Git-Tag: SQUID_6_0_1~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=911833fcbfae14e16c30adeb5bb97e763451018f;p=thirdparty%2Fsquid.git

Prep for 5.7 (#1131)
---

diff --git a/ChangeLog b/ChangeLog
index f42c6d1089..49174d44b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Changes in squid-5.7 (05 Sep 2022):
+
+	- Regression Fix: Typo in manager ACL
+	- Bug 5186: noteDestinationsEnd check failed: transportWait
+	- Bug 5160: Test suite fails with -flto=auto
+	- Bug 3193 pt2: NTLM decoder truncating strings
+	- Bug 5133: OpenSSL 3.0 support
+	- ext_session_acl: fix TDB key lookup
+	- forward_max_tries: Do not count discarded connections
+	- ... and many compile and debugging fixes
+
 Changes in squid-5.6 (06 Jun 2022):
 
 	- Bug 5208: Part 1: Restart kids killed by SIGKILL
diff --git a/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index 2f00b61909..466e9c3b01 100644
--- a/doc/release-notes/release-5.sgml
+++ b/doc/release-notes/release-5.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 5.6 release notes</title>
+<title>Squid 5.7 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -12,7 +12,7 @@ for Applied Network Research and members of the Web Caching community.
 <toc>
 
 <sect>Notice
-<p>The Squid Team are pleased to announce the release of Squid-5.6.
+<p>The Squid Team are pleased to announce the release of Squid-5.7.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v5/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.
@@ -40,6 +40,7 @@ The Squid-5 change history can be <url url="http://www.squid-cache.org/Versions/
 	<item>TrivialDB Support
 	<item>RFC 8586: Loop Detection in Content Delivery Networks
 	<item>Peering support for SSL-Bump
+	<item>OpenSSL 3.0 Support
 </itemize>
 
 Most user-facing changes are reflected in squid.conf (see below).
@@ -151,6 +152,19 @@ Most user-facing changes are reflected in squid.conf (see below).
    yet do TLS-in-TLS.
 
 
+<sect1>OpenSSL 3.0 Support
+<p>Squid-5.7 adds OpenSSL 3.0 support.
+
+<p>This version of Squid does not add any of the new features provided by
+   OpenSSL 3.0. It only contains support for features already supported by prior
+   versions of Squid using new APIs provided by OpenSSL 3.0.
+
+<p>Notably the libssl custom Engine feature has been deprecated by OpenSSL 3.0
+   and new Providers replacement is not supported by this Squid.
+
+<p>OpenSSL 3.0 uses new licensing terms.
+
+
 <sect>Changes to squid.conf since Squid-4
 <p>
 There have been changes to Squid's configuration file since Squid-4.
@@ -287,6 +301,10 @@ This section gives a thorough account of those changes in three categories:
 	<p>Codes <em>rm</em>, <em>&lt;rm</em> and <em>&gt;rm</em> display "-"
 	   instead of the made-up method NONE.
 
+	<tag>ssl_engine</tag>
+	<p>OpenSSL 3.0 deprecates the Engine feature. This directive is
+	   only supported when Squid is built for older OpenSSL versions.
+
 </descrip>
 
 <sect1>Removed directives<label id="removeddirectives">
diff --git a/doc/release-notes/release-6.sgml b/doc/release-notes/release-6.sgml
index 8faa0159f0..251ad69748 100644
--- a/doc/release-notes/release-6.sgml
+++ b/doc/release-notes/release-6.sgml
@@ -63,10 +63,7 @@ This section gives an account of those changes in three categories:
 <sect1>Changes to existing directives<label id="modifieddirectives">
 <p>
 <descrip>
-	<tag>ssl_engine</tag>
-	<p>OpenSSL 3.0.0 deprecates the Engine feature. This directive is
-	   only supported when Squid is built for older OpenSSL versions.
-
+	<p>There have been no directives changed.
 </descrip>
 
 <sect1>Removed directives<label id="removeddirectives">
diff --git a/src/cf.data.pre b/src/cf.data.pre
index e0dd174236..1115c9d096 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -3086,7 +3086,7 @@ DOC_START
 	The OpenSSL engine to use. You will need to set this if you
 	would like to use hardware SSL acceleration for example.
 
-	Not supported in builds with OpenSSL v3 or newer.
+	Not supported in builds with OpenSSL 3.0 or newer.
 DOC_END
 
 NAME: sslproxy_session_ttl
diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index 950d556df2..3b20b3e259 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -660,8 +660,8 @@ Ssl::Initialize(void)
     if (::Config.SSL.ssl_engine) {
 #if OPENSSL_VERSION_MAJOR < 3
         debugs(83, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: Support for ssl_engine is deprecated " <<
-               "in Squids built with OpenSSL v1 (like this Squid). " <<
-               "It is removed in Squids built with OpenSSL v3+.");
+               "in Squids built with OpenSSL 1.x (like this Squid). " <<
+               "It is removed in Squids built with OpenSSL 3.0 or newer.");
 #if !defined(OPENSSL_NO_ENGINE)
         ENGINE_load_builtin_engines();
         ENGINE *e;
@@ -677,7 +677,7 @@ Ssl::Initialize(void)
 #endif
 
 #else /* OPENSSL_VERSION_MAJOR */
-        throw TextException("Cannot use ssl_engine in Squid built with OpenSSL v3+", Here());
+        throw TextException("Cannot use ssl_engine in Squid built with OpenSSL 3.0 or newer", Here());
 #endif
     }