Skip to content

Commit 19a2004

Browse files
ecristecrist
committed
Update OpenSSL to 1.1.1g (again)
Using another build of OpenSSL that appears to work fine in testing. Long term, we should be building OpenSSL ourselves and shipping it on a regular basis. That's another project on the list. Resolves OpenVPN#405. Signed-off-by: Eric F Crist <[email protected]>
1 parent a9cecc7 commit 19a2004

12 files changed

+440
-340
lines changed

‎ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Easy-RSA 3 ChangeLog
22

3+
3.0.9 (TBD)
4+
* Upgrade OpenSSL from 1.1.0j to 1.1.1g for Windows (#405)
5+
36
3.0.8 (2020-09-09)
47
* Provide --version option (#372)
58
* Version information now within generated certificates like on *nix

‎distro/windows/README-OpenSSL.txt

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,4 @@
11
-----------------------------------------------------------------------
2-
OpenSSL v1.1.0j Win64 for ICS, http://www.overbyte.be
2+
OpenSSL v1.1.1g from https://bintray.com/vszakats/generic/openssl
33
-----------------------------------------------------------------------
44

5-
Compiled libraries and binary downloaded from:
6-
http://wiki.overbyte.eu/arch/openssl-1.1.1a-win64.zip
7-
8-
Built with:
9-
Visual Studio Build Tools 2017
10-
The Netwide Assembler (NASM) v2.11.05
11-
Strawberry Perl v5.20.3.1
12-
13-
Build Commands:
14-
perl configure VC-WIN64A-rtt
15-
nmake
16-
17-
Custom configuration file (.conf file at the "Configurations" folder):
18-
19-
## -*- mode: perl; -*-
20-
## Personal configuration targets
21-
22-
%targets = (
23-
"VC-WIN32-rtt" => {
24-
inherit_from => [ "VC-WIN32" ],
25-
cflags => sub{my $v=pop; $v=~ s/\/MD/\/MT/ig; return $v},
26-
lflags => "/nologo /release",
27-
},
28-
"VC-WIN64A-rtt" => {
29-
inherit_from => [ "VC-WIN64A" ],
30-
cflags => sub{my $v=pop; $v=~ s/\/MD/\/MT/ig; return $v},
31-
lflags => "/nologo /release",
32-
},
33-
);

‎distro/windows/win32/LICENSE renamed to ‎distro/windows/win32/LICENSE.txt

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,125 @@
1-
2-
LICENSE ISSUES
3-
==============
4-
5-
The OpenSSL toolkit stays under a double license, i.e. both the conditions of
6-
the OpenSSL License and the original SSLeay license apply to the toolkit.
7-
See below for the actual license texts.
8-
9-
OpenSSL License
10-
---------------
11-
12-
/* ====================================================================
13-
* Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.
14-
*
15-
* Redistribution and use in source and binary forms, with or without
16-
* modification, are permitted provided that the following conditions
17-
* are met:
18-
*
19-
* 1. Redistributions of source code must retain the above copyright
20-
* notice, this list of conditions and the following disclaimer.
21-
*
22-
* 2. Redistributions in binary form must reproduce the above copyright
23-
* notice, this list of conditions and the following disclaimer in
24-
* the documentation and/or other materials provided with the
25-
* distribution.
26-
*
27-
* 3. All advertising materials mentioning features or use of this
28-
* software must display the following acknowledgment:
29-
* "This product includes software developed by the OpenSSL Project
30-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
31-
*
32-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
33-
* endorse or promote products derived from this software without
34-
* prior written permission. For written permission, please contact
35-
* [email protected].
36-
*
37-
* 5. Products derived from this software may not be called "OpenSSL"
38-
* nor may "OpenSSL" appear in their names without prior written
39-
* permission of the OpenSSL Project.
40-
*
41-
* 6. Redistributions of any form whatsoever must retain the following
42-
* acknowledgment:
43-
* "This product includes software developed by the OpenSSL Project
44-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
45-
*
46-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
47-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
48-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
49-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
50-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
51-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
52-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
53-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
54-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
55-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
56-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
57-
* OF THE POSSIBILITY OF SUCH DAMAGE.
58-
* ====================================================================
59-
*
60-
* This product includes cryptographic software written by Eric Young
61-
* ([email protected]). This product includes software written by Tim
62-
* Hudson ([email protected]).
63-
*
64-
*/
65-
66-
Original SSLeay License
67-
-----------------------
68-
69-
/* Copyright (C) 1995-1998 Eric Young ([email protected])
70-
* All rights reserved.
71-
*
72-
* This package is an SSL implementation written
73-
* by Eric Young ([email protected]).
74-
* The implementation was written so as to conform with Netscapes SSL.
75-
*
76-
* This library is free for commercial and non-commercial use as long as
77-
* the following conditions are aheared to. The following conditions
78-
* apply to all code found in this distribution, be it the RC4, RSA,
79-
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
80-
* included with this distribution is covered by the same copyright terms
81-
* except that the holder is Tim Hudson ([email protected]).
82-
*
83-
* Copyright remains Eric Young's, and as such any Copyright notices in
84-
* the code are not to be removed.
85-
* If this package is used in a product, Eric Young should be given attribution
86-
* as the author of the parts of the library used.
87-
* This can be in the form of a textual message at program startup or
88-
* in documentation (online or textual) provided with the package.
89-
*
90-
* Redistribution and use in source and binary forms, with or without
91-
* modification, are permitted provided that the following conditions
92-
* are met:
93-
* 1. Redistributions of source code must retain the copyright
94-
* notice, this list of conditions and the following disclaimer.
95-
* 2. Redistributions in binary form must reproduce the above copyright
96-
* notice, this list of conditions and the following disclaimer in the
97-
* documentation and/or other materials provided with the distribution.
98-
* 3. All advertising materials mentioning features or use of this software
99-
* must display the following acknowledgement:
100-
* "This product includes cryptographic software written by
101-
* Eric Young ([email protected])"
102-
* The word 'cryptographic' can be left out if the rouines from the library
103-
* being used are not cryptographic related :-).
104-
* 4. If you include any Windows specific code (or a derivative thereof) from
105-
* the apps directory (application code) you must include an acknowledgement:
106-
* "This product includes software written by Tim Hudson ([email protected])"
107-
*
108-
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
109-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
110-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
111-
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
112-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
113-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
114-
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
115-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
116-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
117-
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
118-
* SUCH DAMAGE.
119-
*
120-
* The licence and distribution terms for any publically available version or
121-
* derivative of this code cannot be changed. i.e. this code cannot simply be
122-
* copied and put under another distribution licence
123-
* [including the GNU Public Licence.]
124-
*/
125-
1+
2+
LICENSE ISSUES
3+
==============
4+
5+
The OpenSSL toolkit stays under a double license, i.e. both the conditions of
6+
the OpenSSL License and the original SSLeay license apply to the toolkit.
7+
See below for the actual license texts.
8+
9+
OpenSSL License
10+
---------------
11+
12+
/* ====================================================================
13+
* Copyright (c) 1998-2019 The OpenSSL Project. All rights reserved.
14+
*
15+
* Redistribution and use in source and binary forms, with or without
16+
* modification, are permitted provided that the following conditions
17+
* are met:
18+
*
19+
* 1. Redistributions of source code must retain the above copyright
20+
* notice, this list of conditions and the following disclaimer.
21+
*
22+
* 2. Redistributions in binary form must reproduce the above copyright
23+
* notice, this list of conditions and the following disclaimer in
24+
* the documentation and/or other materials provided with the
25+
* distribution.
26+
*
27+
* 3. All advertising materials mentioning features or use of this
28+
* software must display the following acknowledgment:
29+
* "This product includes software developed by the OpenSSL Project
30+
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
31+
*
32+
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
33+
* endorse or promote products derived from this software without
34+
* prior written permission. For written permission, please contact
35+
* [email protected].
36+
*
37+
* 5. Products derived from this software may not be called "OpenSSL"
38+
* nor may "OpenSSL" appear in their names without prior written
39+
* permission of the OpenSSL Project.
40+
*
41+
* 6. Redistributions of any form whatsoever must retain the following
42+
* acknowledgment:
43+
* "This product includes software developed by the OpenSSL Project
44+
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
45+
*
46+
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
47+
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
48+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
49+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
50+
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
51+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
52+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
53+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
54+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
55+
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
56+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
57+
* OF THE POSSIBILITY OF SUCH DAMAGE.
58+
* ====================================================================
59+
*
60+
* This product includes cryptographic software written by Eric Young
61+
* ([email protected]). This product includes software written by Tim
62+
* Hudson ([email protected]).
63+
*
64+
*/
65+
66+
Original SSLeay License
67+
-----------------------
68+
69+
/* Copyright (C) 1995-1998 Eric Young ([email protected])
70+
* All rights reserved.
71+
*
72+
* This package is an SSL implementation written
73+
* by Eric Young ([email protected]).
74+
* The implementation was written so as to conform with Netscapes SSL.
75+
*
76+
* This library is free for commercial and non-commercial use as long as
77+
* the following conditions are aheared to. The following conditions
78+
* apply to all code found in this distribution, be it the RC4, RSA,
79+
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
80+
* included with this distribution is covered by the same copyright terms
81+
* except that the holder is Tim Hudson ([email protected]).
82+
*
83+
* Copyright remains Eric Young's, and as such any Copyright notices in
84+
* the code are not to be removed.
85+
* If this package is used in a product, Eric Young should be given attribution
86+
* as the author of the parts of the library used.
87+
* This can be in the form of a textual message at program startup or
88+
* in documentation (online or textual) provided with the package.
89+
*
90+
* Redistribution and use in source and binary forms, with or without
91+
* modification, are permitted provided that the following conditions
92+
* are met:
93+
* 1. Redistributions of source code must retain the copyright
94+
* notice, this list of conditions and the following disclaimer.
95+
* 2. Redistributions in binary form must reproduce the above copyright
96+
* notice, this list of conditions and the following disclaimer in the
97+
* documentation and/or other materials provided with the distribution.
98+
* 3. All advertising materials mentioning features or use of this software
99+
* must display the following acknowledgement:
100+
* "This product includes cryptographic software written by
101+
* Eric Young ([email protected])"
102+
* The word 'cryptographic' can be left out if the rouines from the library
103+
* being used are not cryptographic related :-).
104+
* 4. If you include any Windows specific code (or a derivative thereof) from
105+
* the apps directory (application code) you must include an acknowledgement:
106+
* "This product includes software written by Tim Hudson ([email protected])"
107+
*
108+
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
109+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
110+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
111+
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
112+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
113+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
114+
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
115+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
116+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
117+
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
118+
* SUCH DAMAGE.
119+
*
120+
* The licence and distribution terms for any publically available version or
121+
* derivative of this code cannot be changed. i.e. this code cannot simply be
122+
* copied and put under another distribution licence
123+
* [including the GNU Public Licence.]
124+
*/
125+

‎distro/windows/win32/libcrypto-1_1.dll

535 KB
Binary file not shown.

‎distro/windows/win32/libssl-1_1.dll

111 KB
Binary file not shown.

‎distro/windows/win32/openssl.exe

100755100644
47.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)