Revert "Update Windows OpenSSL to 1.1.1g from 1.1.0j"

This reverts commit 5f3e5ca. There is an incompatibility in 1.1.1g with the EasyRSA script. There are no new features in 1.1.1g we are leveraging directly, so just going to revert to support the OpenVPN 2.5 release process and get EasyRSA v3.x into more hands. Signed-off-by: Eric F Crist <[email protected]>
OpenVPN · Sep 16, 2020 · a9cecc7 · a9cecc7
1 parent f12e00e
commit a9cecc7
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 45 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -8,7 +8,6 @@ Easy-RSA 3 ChangeLog
    * Added support for export-p8 (#339)
    * Clarified error message (#384)
    * 2->3 upgrade now errors and prints message when vars isn't found (#377)
-   * Update OpenSSL Windows binaries to 1.1.1g
 
 3.0.7 (2020-03-30)
    * Include OpenSSL libs and binary for Windows 1.1.0j

diff --git a/distro/windows/win32/LICENSE b/distro/windows/win32/LICENSE
@@ -10,14 +10,14 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2018 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
+ *    notice, this list of conditions and the following disclaimer. 
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -72,21 +72,21 @@
  * This package is an SSL implementation written
  * by Eric Young ([email protected]).
  * The implementation was written so as to conform with Netscapes SSL.
- *
+ * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson ([email protected]).
- *
+ * 
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -101,10 +101,10 @@
  *     Eric Young ([email protected])"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson ([email protected])"
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -116,7 +116,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
+ * 
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence

diff --git a/distro/windows/win32/libcrypto-1_1.dll b/distro/windows/win32/libcrypto-1_1.dll
diff --git a/distro/windows/win32/libssl-1_1.dll b/distro/windows/win32/libssl-1_1.dll
diff --git a/distro/windows/win32/openssl.exe b/distro/windows/win32/openssl.exe
diff --git a/distro/windows/win32/readme.txt b/distro/windows/win32/readme.txt
@@ -1,20 +1,10 @@
 -----------------------------------------------------------------------
-OpenSSL v1.1.1g Win32 for ICS, http://www.overbyte.be
+OpenSSL v1.1.0j Win32 for ICS, http://www.overbyte.be
 -----------------------------------------------------------------------
 
-Only supports Windows Vista/Server 2008, and later, not Windows XP.
-
-The OpenSSL DLLs and EXE files are digitally code signed 'Open Source
-Developer, Fran�ois PIETTE', the lead developer for ICS.  ICS V8.38 and
-later check the DLLs are correctly signed when opening them.  Beware
-that Windows needs recent root certificates to check newly signed code,
-and may give an error if the root store has not been kept current by
-Windows Update, particularly on older versions of Windows such as Vista,
-7 and Windows 2008.
-
 Built with:
                   Visual Studio Build Tools 2017
-                  The Netwide Assembler (NASM) v2.14.02
+                  The Netwide Assembler (NASM) v2.11.05
                   Strawberry Perl v5.20.3.1
 
 Build Commands:
@@ -32,9 +22,9 @@ Custom configuration file (.conf file at the "Configurations" folder):
         cflags           => sub{my $v=pop; $v=~ s/\/MD/\/MT/ig; return $v},
         lflags           => "/nologo /release",
     },
-    "VC-WIN64A-rtt" => {
+	"VC-WIN64A-rtt" => {
         inherit_from     => [ "VC-WIN64A" ],
         cflags           => sub{my $v=pop; $v=~ s/\/MD/\/MT/ig; return $v},
         lflags           => "/nologo /release",
     },
-);
+);
diff --git a/distro/windows/win64/LICENSE b/distro/windows/win64/LICENSE
@@ -10,14 +10,14 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2018 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
+ *    notice, this list of conditions and the following disclaimer. 
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -72,21 +72,21 @@
  * This package is an SSL implementation written
  * by Eric Young ([email protected]).
  * The implementation was written so as to conform with Netscapes SSL.
- *
+ * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson ([email protected]).
- *
+ * 
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -101,10 +101,10 @@
  *     Eric Young ([email protected])"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson ([email protected])"
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -116,7 +116,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
+ * 
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence

diff --git a/distro/windows/win64/libcrypto-1_1-x64.dll b/distro/windows/win64/libcrypto-1_1-x64.dll
diff --git a/distro/windows/win64/libssl-1_1-x64.dll b/distro/windows/win64/libssl-1_1-x64.dll
diff --git a/distro/windows/win64/openssl.exe b/distro/windows/win64/openssl.exe
diff --git a/distro/windows/win64/readme.txt b/distro/windows/win64/readme.txt
@@ -1,20 +1,10 @@
 -----------------------------------------------------------------------
-OpenSSL v1.1.1g Win64 for ICS, http://www.overbyte.be
+OpenSSL v1.1.0j Win64 for ICS, http://www.overbyte.be
 -----------------------------------------------------------------------
 
-Only supports Windows Vista/Server 2008, and later, not Windows XP.
-
-The OpenSSL DLLs and EXE files are digitally code signed 'Open Source
-Developer, Fran�ois PIETTE', the lead developer for ICS.  ICS V8.38 and
-later check the DLLs are correctly signed when opening them.  Beware
-that Windows needs recent root certificates to check newly signed code,
-and may give an error if the root store has not been kept current by
-Windows Update, particularly on older versions of Windows such as Vista,
-7 and Windows 2008.
-
 Built with:
                   Visual Studio Build Tools 2017
-                  The Netwide Assembler (NASM) v2.14.02
+                  The Netwide Assembler (NASM) v2.11.05
                   Strawberry Perl v5.20.3.1
 
 Build Commands:
@@ -32,9 +22,9 @@ Custom configuration file (.conf file at the "Configurations" folder):
         cflags           => sub{my $v=pop; $v=~ s/\/MD/\/MT/ig; return $v},
         lflags           => "/nologo /release",
     },
-    "VC-WIN64A-rtt" => {
+	"VC-WIN64A-rtt" => {
         inherit_from     => [ "VC-WIN64A" ],
         cflags           => sub{my $v=pop; $v=~ s/\/MD/\/MT/ig; return $v},
         lflags           => "/nologo /release",
     },
-);
+);