stunnel-5.65

mtrojnar · Jul 17, 2022 · 3841d34 · 3841d34
1 parent 933afeb
commit 3841d34
Show file tree

Hide file tree

Showing 77 changed files with 1,215 additions and 812 deletions.
diff --git a/BUGS.md b/BUGS.md
@@ -1,4 +1,4 @@
 # stunnel known bugs
 
 
-* Shared library for transparent proxy does not support IPv6.
+* The shared library for transparent proxy does not support IPv6.
diff --git a/CREDITS.md b/CREDITS.md
@@ -3,38 +3,40 @@
 
 The code contributions are licensed as public domain unless stated otherwise.
 
-Several Win32 and WCE improvements and bugfixes:
-* Pierre Delaage <delaage.pierre@free.fr>
-
-systemd socket activation in version 5.05:
-Copyright (c) 2014 Mark Theunissen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Several bugfixes and improvements mostly in versions 3.xx:
-* Brian Hatch <bri@stunnel.org>
-
-Initial PTY support in version 3.05:
-* Dirk O. Siebnich <dok@vossnet.de>
-
-Initial SSL support in versions 1.x:
-* Adam Hernik <adas@infocentrum.com>
-* Pawel Krawczyk <kravietz@ceti.com.pl>
+* Several Win32 and WCE improvements and bugfixes
+  - Pierre Delaage <delaage.pierre@free.fr>
+
+* Systemd socket activation dded in version 5.05
+  - Mark Theunissen
+
+  > Copyright (c) 2014 Mark Theunissen
+  >
+  > Permission is hereby granted, free of charge, to any person obtaining a copy of
+  > this software and associated documentation files (the "Software"), to deal in
+  > the Software without restriction, including without limitation the rights to
+  > use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+  > of the Software, and to permit persons to whom the Software is furnished to do
+  > so, subject to the following conditions:
+  >
+  > The above copyright notice and this permission notice shall be included in all
+  > copies or substantial portions of the Software.
+  >
+  > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  > IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  > FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  > AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  > LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  > SOFTWARE.
+
+* Several bugfixes and improvements mostly in versions 3.xx
+  - Brian Hatch <bri@stunnel.org>
+
+* Initial PTY support in version 3.05:
+  - Dirk O. Siebnich <dok@vossnet.de>
+
+* Initial SSL support in versions 1.x:
+  - Adam Hernik <adas@infocentrum.com>
+  - Pawel Krawczyk <kravietz@ceti.com.pl>
 
 and many others...
diff --git a/Makefile.in b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -187,16 +187,13 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/auto/compile \
 	$(top_srcdir)/auto/config.guess $(top_srcdir)/auto/config.sub \
 	$(top_srcdir)/auto/install-sh $(top_srcdir)/auto/ltmain.sh \
-	$(top_srcdir)/auto/missing auto/compile auto/config.guess \
-	auto/config.sub auto/depcomp auto/install-sh auto/ltmain.sh \
-	auto/missing
+	$(top_srcdir)/auto/missing AUTHORS.md NEWS.md README.md \
+	auto/compile auto/config.guess auto/config.sub auto/depcomp \
+	auto/install-sh auto/ltmain.sh auto/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -253,6 +250,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFAULT_GROUP = @DEFAULT_GROUP@
 DEFS = @DEFS@
@@ -264,6 +263,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -304,6 +304,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_CXX = @PTHREAD_CXX@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANDOM_FILE = @RANDOM_FILE@
 RANLIB = @RANLIB@
@@ -549,7 +550,6 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,14 @@
 # stunnel change log
 
 
+### Version 5.65, 2022.07.11, urgency: HIGH
+* Security bugfixes
+  - OpenSSL DLLs updated to version 3.0.5.
+* Bugfixes
+  - Fixed handling globally enabled FIPS.
+  - Fixed the default openssl.cnf path in stunnel.exe.
+  - Fixed a number of MSVC warnings.
+
 ### Version 5.64, 2022.05.06, urgency: MEDIUM
 * Security bugfixes
   - OpenSSL DLLs updated to version 3.0.3.

diff --git a/README.md b/README.md
@@ -3,24 +3,31 @@
 
 ### Short description
 
-     The stunnel program is designed to work as an SSL encryption
-     wrapper between remote client and local (inetd-startable) or
-     remote servers. The goal is to facilitate SSL encryption and
-     authentication for non-SSL-aware programs.
+The stunnel program is designed to work as an SSL encryption
+wrapper between remote client and local (inetd-startable) or
+remote servers. The goal is to facilitate SSL encryption and
+authentication for non-SSL-aware programs.
 
-     stunnel can be used to add  SSL  functionality  to  commonly
-     used  inetd  daemons  like  POP-2,  POP-3  and  IMAP servers
-     without any changes in the programs' code.
+stunnel can be used to add  SSL  functionality  to  commonly
+used  inetd  daemons  like  POP-2,  POP-3  and  IMAP servers
+without any changes in the programs' code.
 
 ### License
 
-     See [COPYING](COPYING.md) file.
+* [COPYING](COPYING.md) A short license overview
+* [COPYRIGHT](COPYRIGHT.md) The complete terms and conditions
+* [CREDITS](CREDITS.md) A list of major contributions
 
-### Other files you should read
+### Other useful files
 
-     [NEWS](NEWS.md) What I did
-     [TODO](TODO.md) What I'm going to do
+* [NEWS](NEWS.md) What I did
+* [TODO](TODO.md) What I'm going to do
+* [BUGS](BUGS.md) Known bugs
+* [INSTALL.FIPS](INSTALL.FIPS.md), [INSTALL.W32](INSTALL.W32.md) and
+  [INSTALL.WCE](INSTALL.WCE.md) Additional installation notes
+* [PORTS](PORTS.md) Known ports
 
 ### Reporting problems and other contacts
 
-     See the [FAQ](https://www.stunnel.org/faq.html).
+* [Support](https://www.stunnel.org/support.html) options
+* [Contacts](https://www.stunnel.org/contact.html)