Skip to content

Commit 3407dfb

Browse files
committed
Upgrade OpenSSL to 1.0.0j
1 parent 0d635ae commit 3407dfb

6 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ Tests
235235
Build
236236
-----
237237

238+
- The Windows build now uses OpenSSL 1.0.0j and bzip2 1.0.6.
239+
238240
- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.
239241

240242
- Issue #14437: Fix building the _io module under Cygwin.

‎PC/VC6/readme.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,9 @@ _ssl
153153

154154
Unpack into the "dist" directory, retaining the folder name from
155155
the archive - for example, the latest stable OpenSSL will install as
156-
dist/openssl-1.0.0a
156+
dist/openssl-1.0.0j
157157

158-
You can (theoretically) use any version of OpenSSL you like - the
159-
build process will automatically select the latest version.
158+
You need to use version 1.0.0j of OpenSSL.
160159

161160
You can install the NASM assembler from
162161
http://www.nasm.us/

‎PC/VS8.0/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
/>
5959
<UserMacro
6060
Name="opensslDir"
61-
Value="$(externalsDir)\openssl-1.0.0a"
61+
Value="$(externalsDir)\openssl-1.0.0j"
6262
/>
6363
<UserMacro
6464
Name="tcltkDir"

‎PCbuild/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
/>
5959
<UserMacro
6060
Name="opensslDir"
61-
Value="$(externalsDir)\openssl-1.0.0a"
61+
Value="$(externalsDir)\openssl-1.0.0j"
6262
/>
6363
<UserMacro
6464
Name="tcltkDir"

‎PCbuild/readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ _ssl
139139

140140
Get the source code through
141141

142-
svn export http://svn.python.org/projects/external/openssl-1.0.0a
142+
svn export http://svn.python.org/projects/external/openssl-1.0.0j
143143

144144
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
145145
obtaining external sources then you don't need to manually get the source

‎Tools/buildbot/external-common.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cd ..
1414
@rem if exist tk8.4.16 rd /s/q tk8.4.16
1515
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
1616
@rem if exist db-4.4.20 rd /s/q db-4.4.20
17-
@rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
17+
@rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j
1818
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
1919

2020
@rem bzip
@@ -24,7 +24,7 @@ if not exist bzip2-1.0.6 (
2424
)
2525

2626
@rem OpenSSL
27-
if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
27+
if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
2828

2929
@rem tcl/tk
3030
if not exist tcl-8.5.9.0 (

0 commit comments

Comments
 (0)