summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-07-30 17:30:51 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-07-30 17:30:51 (GMT)
commite38de851eba7d47d3cf93db2feee0d91e361a3e1 (patch)
tree7db7d30efcece60939633c2b0b81017c78ff7d43
parentf10021dd80403478b1c9e276b6427b8cb1aa6cfc (diff)
downloadcpython-e38de851eba7d47d3cf93db2feee0d91e361a3e1.zip
cpython-e38de851eba7d47d3cf93db2feee0d91e361a3e1.tar.gz
cpython-e38de851eba7d47d3cf93db2feee0d91e361a3e1.tar.bz2
Use OpenSSL 1.0.0a on Windows.
-rw-r--r--Misc/NEWS2
-rw-r--r--PCbuild/pyproject.vsprops2
-rw-r--r--PCbuild/readme.txt2
3 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index ef7433b..3955ab1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1672,6 +1672,8 @@ Extension Modules
Build
-----
+- Use OpenSSL 1.0.0a on Windows.
+
- Issue #9280: Make sharedinstall depend on sharedmods.
- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 1b96e35..52cef12 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-0.9.8l"
+ Value="$(externalsDir)\openssl-1.0.0a"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 8742b46..eec7d4c 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -139,7 +139,7 @@ _ssl
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-0.9.8l
+ svn export http://svn.python.org/projects/external/openssl-1.0.0a
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source