diff --git a/NEWS.md b/NEWS.md index 0d2e4c1..7086cf6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,17 @@ +### SSLproxy 0.9.3 2022-05-02 + +- Implement a generic upgrade mechanism with autossl, without STARTTLS. +- Refactor and improve autossl and split mode. +- Fix watermarking for underlying buffers in autossl. +- Fix macOS header selection, update XNU headers for macOS, and re-enable osx + on Travis CI. +- Fix the natengine option passed in proxyspecs on command line. +- Fix enabling of pcap and mirror logging. +- Fix build errors with OpenSSL 3.x. + + ### SSLproxy 0.9.2 2021-11-14 - Update with the license change of the Aho Corasick library to the LGPL. diff --git a/src/sslproxy.1 b/src/sslproxy.1 index 65bbe7c..cc27950 100644 --- a/src/sslproxy.1 +++ b/src/sslproxy.1 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "sslproxy" "1" "13 November 2021" "v0.9.2" "SSLproxy" +.TH "sslproxy" "1" "02 May 2022" "v0.9.3" "SSLproxy" .SH NAME sslproxy \-\- transparent SSL/TLS proxy for decrypting and diverting network traffic to other programs for deep SSL inspection diff --git a/src/sslproxy.conf b/src/sslproxy.conf index 7cce4fd..e3cd1d1 100644 --- a/src/sslproxy.conf +++ b/src/sslproxy.conf @@ -1,4 +1,4 @@ -# Sample configuration for sslproxy v0.9.2 +# Sample configuration for sslproxy v0.9.3 # # Use the -f command line option to start sslproxy with a config file. # See sslproxy.conf(5) and sslproxy(1) for documentation. @@ -266,12 +266,12 @@ PassUsers admin # Set divert or split mode of operation # Not equivalent to the command line -n option. # Applied to the proxyspecs defined after it, and structured proxyspecs can override it. -# Note that if the arg is not yes|no, this is assumed to be a Divert filter rule. +# Note that if the arg is not yes|no, it is assumed to be a Divert filter rule. # (default: yes) #Divert yes # Passthrough sites -# The PassSite option is a special form of Pass filter rule +# The PassSite option is a special form of the Pass filter rule # PassSite rules can be written as Pass filter rules, see filter rule examples # PassSite rules will be deprecated in favor of filter rules in the future # site[*] [(clientaddr|user|*) [description desc]] @@ -288,7 +288,7 @@ PassUsers admin #Include /etc/sslproxy/proxyspecs.conf # Define macro to be used in filtering rules. Macro names must start with a $ -# char. The macro name must be followed by words separated with spaces. +# sign. The macro name must be followed by words separated with spaces. # Recursive macro definitions are not allowed. #Define $macro value1 value2 @@ -383,7 +383,7 @@ ProxySpec smtps 127.0.0.1 8465 up:9199 ProxySpec http 127.0.0.1 8081 # Structured proxy specifications -# Global config is cloned into all proxyspecs first +# The global config is cloned into all proxyspecs first # Each proxyspec can override its cloned global config ProxySpec { Proto https @@ -450,7 +450,7 @@ ProxySpec { Define $admins soner admin Pass from user $admins desc android to cn .fbcdn.net* - # Structured version of one line filtering rule above + # Structured version of the one line filtering rule above FilterRule { Action Pass User $admins diff --git a/src/sslproxy.conf.5 b/src/sslproxy.conf.5 index f5f574b..d457c89 100644 --- a/src/sslproxy.conf.5 +++ b/src/sslproxy.conf.5 @@ -26,7 +26,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.TH "sslproxy.conf" "5" "13 November 2021" "v0.9.2" "SSLproxy" +.TH "sslproxy.conf" "5" "02 May 2022" "v0.9.3" "SSLproxy" .SH "NAME" .LP \fBsslproxy.conf\fR \- Configuration file for SSLproxy diff --git a/tests/testproxy/sslproxy.conf b/tests/testproxy/sslproxy.conf index 1a002ea..92c681b 100644 --- a/tests/testproxy/sslproxy.conf +++ b/tests/testproxy/sslproxy.conf @@ -1,4 +1,4 @@ -# TestProxy test configuration for sslproxy v0.9.2 +# TestProxy test configuration for sslproxy v0.9.3 # Global options #User _sslproxy diff --git a/tests/testproxy/sslproxy_no_tls11.conf b/tests/testproxy/sslproxy_no_tls11.conf index 768bbd4..a18adaf 100644 --- a/tests/testproxy/sslproxy_no_tls11.conf +++ b/tests/testproxy/sslproxy_no_tls11.conf @@ -1,4 +1,4 @@ -# TestProxy test configuration for sslproxy v0.9.2 +# TestProxy test configuration for sslproxy v0.9.3 # Global options #User _sslproxy diff --git a/tests/testproxy/sslproxy_no_tls13.conf b/tests/testproxy/sslproxy_no_tls13.conf index c855801..64091db 100644 --- a/tests/testproxy/sslproxy_no_tls13.conf +++ b/tests/testproxy/sslproxy_no_tls13.conf @@ -1,4 +1,4 @@ -# TestProxy test configuration for sslproxy v0.9.2 +# TestProxy test configuration for sslproxy v0.9.3 # Global options #User _sslproxy