Merge tag 'stunnel-5.53' into stunnel-5.53-mapoid

stunnel-5.53

ChangeLog

@@ -1,5 +1,11 @@
 stunnel change log
 
+Version 5.53, 2019.04.10, urgency: HIGH
+* Bugfixes
+  - Fixed data transfer stalls introduced in stunnel 5.51.
+* New features
+  - Android binary updated to support Android 4.x.
+
 Version 5.52, 2019.04.08, urgency: HIGH
 * Bugfixes
   - Fixed a transfer() loop bug introduced in stunnel 5.51.

build-android.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -ev
-VERSION=5.52
+VERSION=5.53
 DST=stunnel-$VERSION-android
 
 # install Android NDK on Arch Linux:
@@ -12,13 +12,14 @@ DST=stunnel-$VERSION-android
 # build OpenSSL:
 # export ANDROID_NDK=/usr/lib/android-ndk
 # export PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin:$PATH
-# ./Configure no-shared --prefix=/opt/openssl-android android-arm
-# make && sudo make install
+# ./Configure no-shared --prefix=/opt/openssl-android android-arm -D__ANDROID_API__=14
+# make
+# sudo PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin:$PATH make install
 
 # Debian does not deploy /etc/profile.d/android-ndk.sh
 test -d "$ANDROID_NDK" || ANDROID_NDK=/usr/lib/android-ndk
 
-ANDROID_SYSROOT=$ANDROID_NDK/platforms/android-23/arch-arm
+ANDROID_SYSROOT=$ANDROID_NDK/platforms/android-14/arch-arm
 export CPPFLAGS="--sysroot=$ANDROID_SYSROOT"
 export CFLAGS="--sysroot=$ANDROID_SYSROOT"
 export PATH="$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin:$PATH"

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for stunnel 5.52.
+# Generated by GNU Autoconf 2.69 for stunnel 5.53.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='stunnel'
 PACKAGE_TARNAME='stunnel'
-PACKAGE_VERSION='5.52'
-PACKAGE_STRING='stunnel 5.52'
+PACKAGE_VERSION='5.53'
+PACKAGE_STRING='stunnel 5.53'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures stunnel 5.52 to adapt to many kinds of systems.
+\`configure' configures stunnel 5.53 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1409,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of stunnel 5.52:";;
+     short | recursive ) echo "Configuration of stunnel 5.53:";;
    esac
   cat <<\_ACEOF
 
@@ -1528,7 +1528,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-stunnel configure 5.52
+stunnel configure 5.53
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2134,7 +2134,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by stunnel $as_me 5.52, which was
+It was created by stunnel $as_me 5.53, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3003,7 +3003,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='stunnel'
- VERSION='5.52'
+ VERSION='5.53'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16901,7 +16901,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by stunnel $as_me 5.52, which was
+This file was extended by stunnel $as_me 5.53, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16967,7 +16967,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-stunnel config.status 5.52
+stunnel config.status 5.53
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([stunnel],[5.52])
+AC_INIT([stunnel],[5.53])
 AC_MSG_NOTICE([**************************************** initialization])
 AC_CONFIG_AUX_DIR(auto)
 AC_CONFIG_MACRO_DIR([m4])

doc/Makefile.am

@@ -9,7 +9,8 @@ man_MANS = stunnel.8 stunnel.pl.8
 docdir = $(datadir)/doc/stunnel
 doc_DATA = stunnel.html stunnel.pl.html
 
-CLEANFILES = $(man_MANS) $(doc_DATA)
+CLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(doc_DATA)
 
 SUFFIXES = .pod.in .8.in .html.in
 

doc/Makefile.in

@@ -285,7 +285,8 @@ EXTRA_DIST = stunnel.pod.in stunnel.8.in stunnel.html.in en \
 	stunnel.pl.pod.in stunnel.pl.8.in stunnel.pl.html.in pl
 man_MANS = stunnel.8 stunnel.pl.8
 doc_DATA = stunnel.html stunnel.pl.html
-CLEANFILES = $(man_MANS) $(doc_DATA)
+CLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(doc_DATA)
 SUFFIXES = .pod.in .8.in .html.in
 edit = sed \
 	-e 's|@bindir[@]|$(bindir)|g' \
@@ -466,6 +467,7 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"

src/client.c

@@ -437,9 +437,6 @@ NOEXPORT void client_try(CLI *c) {
         remote_start(c);
     }
     protocol(c, c->opt, PROTOCOL_LATE);
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-    SSL_set_read_ahead(c->ssl, 1); /* *after* protocol negotiations */
-#endif
     transfer(c);
 }
 

src/dhparam.c

@@ -5,32 +5,32 @@
 DH *get_dh2048(void)
 {
     static unsigned char dhp_2048[] = {
-        0x98, 0x84, 0x63, 0x2C, 0x34, 0x28, 0xA2, 0xAE, 0x73, 0xE0,
-        0x13, 0x53, 0x9A, 0x9B, 0x78, 0xAE, 0x83, 0xD7, 0x18, 0x2A,
-        0xB3, 0x22, 0x63, 0x09, 0x29, 0xFC, 0x4F, 0x49, 0x5B, 0x30,
-        0xF0, 0x6F, 0xCA, 0xD9, 0x5D, 0x75, 0x60, 0x11, 0x4E, 0x7C,
-        0x1B, 0x50, 0xBA, 0x7B, 0x49, 0x94, 0x88, 0x99, 0x63, 0xA5,
-        0x9B, 0x7A, 0x4C, 0x42, 0x50, 0xF7, 0x63, 0xFC, 0x17, 0x29,
-        0xEE, 0x95, 0x8C, 0x48, 0x61, 0x09, 0x50, 0xD6, 0xA3, 0x7A,
-        0x28, 0xEC, 0xAF, 0x2C, 0x4B, 0x6C, 0x77, 0xFA, 0x1C, 0xAA,
-        0x10, 0x41, 0xD9, 0xBF, 0x47, 0xCF, 0x51, 0x08, 0x42, 0x48,
-        0xEE, 0x78, 0x67, 0x13, 0xE0, 0x1D, 0x3C, 0x54, 0x3C, 0x00,
-        0x93, 0x3C, 0x7A, 0x13, 0xAA, 0x3E, 0x81, 0x9F, 0x27, 0xCB,
-        0xBA, 0xCA, 0x5C, 0x30, 0x32, 0x6D, 0xCC, 0x93, 0xEC, 0x9A,
-        0x63, 0x89, 0x14, 0x4D, 0x15, 0xB5, 0xD7, 0x38, 0x83, 0x35,
-        0x6B, 0x5D, 0xF4, 0x86, 0x5F, 0x60, 0x61, 0xC0, 0x41, 0xDF,
-        0x12, 0x1C, 0x5E, 0x99, 0xAB, 0x76, 0x64, 0x3C, 0x3B, 0x05,
-        0x3D, 0xA4, 0x21, 0x04, 0x3A, 0xAE, 0xED, 0x51, 0x35, 0x42,
-        0xC8, 0xAE, 0x2C, 0x07, 0xD3, 0x7B, 0x67, 0x27, 0x22, 0x29,
-        0x91, 0x88, 0x57, 0x19, 0x5E, 0xA7, 0x90, 0x5D, 0xCF, 0x6B,
-        0xC8, 0x7F, 0xCB, 0x35, 0x00, 0xB6, 0xA1, 0x47, 0x60, 0xFC,
-        0x5B, 0x45, 0xC4, 0x4A, 0xAD, 0xC8, 0x28, 0x76, 0xF3, 0x0B,
-        0xC5, 0x8B, 0x95, 0x51, 0xF2, 0xBA, 0x77, 0xA1, 0x87, 0xA7,
-        0xC7, 0x26, 0x42, 0x1C, 0xE5, 0xEA, 0xE8, 0x3E, 0xCF, 0xC9,
-        0xB6, 0xA3, 0x96, 0x79, 0xB6, 0xB4, 0x57, 0xDE, 0x71, 0x70,
-        0x05, 0x45, 0x27, 0xF0, 0x9F, 0x72, 0x87, 0xB5, 0xD5, 0xDF,
-        0xA3, 0x5C, 0xBC, 0x61, 0xB6, 0x67, 0xDD, 0x70, 0x1C, 0x9C,
-        0x1A, 0x5B, 0x9D, 0x4C, 0x1C, 0x03
+        0xFF, 0x50, 0x81, 0xF5, 0x24, 0x04, 0xBE, 0x68, 0x3D, 0x8B,
+        0xB0, 0xCA, 0x4F, 0x7D, 0x71, 0x49, 0xD7, 0x69, 0x5F, 0x3B,
+        0x21, 0xB8, 0x99, 0xB1, 0xEB, 0x30, 0x96, 0x15, 0x05, 0xEA,
+        0x7C, 0xE2, 0xD7, 0xB7, 0xB7, 0x07, 0x97, 0x0E, 0x0D, 0x36,
+        0x28, 0x59, 0x83, 0xDF, 0x6F, 0x57, 0x29, 0x81, 0xE8, 0xB2,
+        0xD7, 0x74, 0x16, 0x42, 0x04, 0x05, 0x3D, 0x71, 0x86, 0x25,
+        0xF5, 0x81, 0x8A, 0x21, 0x78, 0x02, 0xA0, 0x08, 0x24, 0xD6,
+        0xAE, 0xC2, 0x9E, 0x6C, 0x1D, 0x81, 0x3A, 0x45, 0x02, 0xF0,
+        0x32, 0xAD, 0x52, 0x92, 0xF5, 0x0E, 0xAC, 0xFB, 0x47, 0x02,
+        0x85, 0xDB, 0x02, 0x56, 0x5D, 0x01, 0x72, 0xDE, 0x72, 0x07,
+        0xED, 0x83, 0x80, 0x2F, 0x15, 0x02, 0x71, 0xA2, 0xDA, 0xDE,
+        0x09, 0x48, 0xE3, 0x87, 0x08, 0x2E, 0x56, 0x4C, 0x5C, 0xC5,
+        0x6D, 0x8E, 0xC4, 0xE9, 0x26, 0x9E, 0xA7, 0xA8, 0xE9, 0x24,
+        0xF4, 0xC3, 0xF3, 0x11, 0xC4, 0xA0, 0x64, 0xCB, 0xD0, 0x0B,
+        0x6B, 0x49, 0xA8, 0x14, 0x77, 0xB8, 0x4E, 0x7F, 0x77, 0x3E,
+        0x45, 0x5C, 0x4B, 0x3D, 0x43, 0x30, 0xB1, 0x8C, 0x24, 0x47,
+        0x26, 0xCF, 0xFD, 0x7A, 0x9A, 0x38, 0x05, 0xB1, 0xCA, 0x43,
+        0x84, 0x39, 0xEE, 0x7A, 0x45, 0x5F, 0x7D, 0x38, 0x8E, 0xD0,
+        0x03, 0x08, 0x94, 0x84, 0xD4, 0xFC, 0x22, 0x5C, 0x27, 0x3F,
+        0x1E, 0xDC, 0x06, 0x38, 0x72, 0x02, 0xDE, 0xE3, 0x50, 0xB0,
+        0x23, 0x19, 0x54, 0xF2, 0xA2, 0x20, 0xDC, 0xC6, 0x2C, 0xA0,
+        0xA8, 0x68, 0x87, 0xB3, 0x48, 0xCD, 0x27, 0x26, 0x21, 0x88,
+        0xC5, 0x09, 0x39, 0x8F, 0xF3, 0xCE, 0x49, 0x1E, 0xF5, 0x07,
+        0xB6, 0xF6, 0x28, 0xC6, 0xD7, 0xCB, 0xC4, 0x9C, 0x40, 0x48,
+        0xA4, 0x9F, 0x77, 0xB4, 0x90, 0x0F, 0xC3, 0xA3, 0x9D, 0xEC,
+        0xF9, 0xC0, 0xBF, 0x36, 0x5C, 0x2B
     };
     static unsigned char dhg_2048[] = {
         0x02
@@ -52,4 +52,4 @@ DH *get_dh2048(void)
     return dh;
 }
 #endif /* OPENSSL_NO_DH */
-/* built for stunnel 5.52 */
+/* built for stunnel 5.53 */

src/os2.mak

@@ -1,11 +1,11 @@
 prefix=.
 DEFS = -DPACKAGE_NAME=\"stunnel\" \
 	-DPACKAGE_TARNAME=\"stunnel\" \
-	-DPACKAGE_VERSION=\"5.52\" \
-	-DPACKAGE_STRING=\"stunnel\ 5.52\" \
+	-DPACKAGE_VERSION=\"5.53\" \
+	-DPACKAGE_STRING=\"stunnel\ 5.53\" \
 	-DPACKAGE_BUGREPORT=\"\" \
 	-DPACKAGE=\"stunnel\" \
-	-DVERSION=\"5.52\" \
+	-DVERSION=\"5.53\" \
 	-DSTDC_HEADERS=1 \
 	-DHAVE_SYS_TYPES_H=1 \
 	-DHAVE_SYS_STAT_H=1 \

src/version.h

@@ -65,7 +65,7 @@
 
 /* START CUSTOMIZE */
 #define VERSION_MAJOR 5
-#define VERSION_MINOR 52
+#define VERSION_MINOR 53
 /* END CUSTOMIZE */
 
 /* all the following macros are ABSOLUTELY NECESSARY to have proper string

tools/stunnel.spec

@@ -1,5 +1,5 @@
 Name:           stunnel
-Version:        5.52
+Version:        5.53
 Release:        1%{?dist}
 Summary:        An TLS-encrypting socket wrapper
 Group:          Applications/Internet