changeset: 76999:0a1d7be10946
user: Antoine Pitrou <solipsis@pitrou.net>
date: Wed May 16 16:41:26 2012 +0200
files: Lib/test/test_hashlib.py Misc/NEWS setup.py
description:
Issue #14693: Under non-Windows platforms, hashlib's fallback modules are always compiled, even if OpenSSL is present at build time.
diff -r 828be43434e8 -r 0a1d7be10946 Lib/test/test_hashlib.py
--- a/Lib/test/test_hashlib.py	Wed May 16 16:03:07 2012 +0200
+++ b/Lib/test/test_hashlib.py	Wed May 16 16:41:26 2012 +0200
@@ -9,6 +9,7 @@
 import array
 import hashlib
 import itertools
+import os
 import sys
 try:
 import threading
@@ -37,7 +38,8 @@
 'sha224', 'SHA224', 'sha256', 'SHA256',
 'sha384', 'SHA384', 'sha512', 'SHA512' )
 
- _warn_on_extension_import = COMPILED_WITH_PYDEBUG
+ # Issue #14693: fallback modules are always compiled under POSIX
+ _warn_on_extension_import = os.name == 'posix' or COMPILED_WITH_PYDEBUG
 
 def _conditional_import_module(self, module_name):
 """Import a module and return a reference to it or None on failure."""
diff -r 828be43434e8 -r 0a1d7be10946 Misc/NEWS
--- a/Misc/NEWS	Wed May 16 16:03:07 2012 +0200
+++ b/Misc/NEWS	Wed May 16 16:41:26 2012 +0200
@@ -125,6 +125,9 @@
 Build
 -----
 
+- Issue #14693: Under non-Windows platforms, hashlib's fallback modules are
+ always compiled, even if OpenSSL is present at build time.
+
 - Issue #13210: Windows build now uses VS2010, ported from VS2008.
 
 
diff -r 828be43434e8 -r 0a1d7be10946 setup.py
--- a/setup.py	Wed May 16 16:03:07 2012 +0200
+++ b/setup.py	Wed May 16 16:41:26 2012 +0200
@@ -749,20 +749,17 @@
 openssl_ver)
 missing.append('_hashlib')
 
- min_sha2_openssl_ver = 0x00908000
- if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
- # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
- exts.append( Extension('_sha256', ['sha256module.c'],
- depends=['hashlib.h']) )
- exts.append( Extension('_sha512', ['sha512module.c'],
- depends=['hashlib.h']) )
-
- if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
- # no openssl at all, use our own md5 and sha1
- exts.append( Extension('_md5', ['md5module.c'],
- depends=['hashlib.h']) )
- exts.append( Extension('_sha1', ['sha1module.c'],
- depends=['hashlib.h']) )
+ # We always compile these even when OpenSSL is available (issue #14693).
+ # It's harmless and the object code is tiny (40-50 KB per module,
+ # only loaded when actually used).
+ exts.append( Extension('_sha256', ['sha256module.c'],
+ depends=['hashlib.h']) )
+ exts.append( Extension('_sha512', ['sha512module.c'],
+ depends=['hashlib.h']) )
+ exts.append( Extension('_md5', ['md5module.c'],
+ depends=['hashlib.h']) )
+ exts.append( Extension('_sha1', ['sha1module.c'],
+ depends=['hashlib.h']) )
 
 # Modules that provide persistent dictionary-like semantics. You will
 # probably want to arrange for at least one of them to be available on
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/0a1d7be10946">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/0a1d7be10946" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>