Kaydet (Commit) 2f21eb3a authored tarafından Gregory P. Smith's avatar Gregory P. Smith

Adds stand alone _md5 and _sha1 modules for use by hashlib on systems

when the OpenSSL library is either not present or not found by setup.py.

These are derived from the public domain libtomcrypt (libtom.org) just like
the existing sha256 and sha512 modules.
üst b3b4dbef
...@@ -10,8 +10,8 @@ new(name, data=b'') - returns a new hash object implementing the ...@@ -10,8 +10,8 @@ new(name, data=b'') - returns a new hash object implementing the
given hash function; initializing the hash given hash function; initializing the hash
using the given binary data. using the given binary data.
Named constructor functions are also available, these are much faster Named constructor functions are also available, these are faster
than using new(): than using new(name):
md5(), sha1(), sha224(), sha256(), sha384(), and sha512() md5(), sha1(), sha224(), sha256(), sha384(), and sha512()
...@@ -22,14 +22,13 @@ Choose your hash function wisely. Some have known collision weaknesses. ...@@ -22,14 +22,13 @@ Choose your hash function wisely. Some have known collision weaknesses.
sha384 and sha512 will be slow on 32 bit platforms. sha384 and sha512 will be slow on 32 bit platforms.
Hash objects have these methods: Hash objects have these methods:
- update(arg): Update the hash object with the string arg. Repeated calls - update(arg): Update the hash object with the bytes in arg. Repeated calls
are equivalent to a single call with the concatenation of all are equivalent to a single call with the concatenation of all
the arguments. the arguments.
- digest(): Return the digest of the strings passed to the update() method - digest(): Return the digest of the bytes passed to the update() method
so far. This may contain non-ASCII characters, including so far.
NUL bytes. - hexdigest(): Like digest() except the digest is returned as a unicode
- hexdigest(): Like digest() except the digest is returned as a string of object of double length, containing only hexadecimal digits.
double length, containing only hexadecimal digits.
- copy(): Return a copy (clone) of the hash object. This can be used to - copy(): Return a copy (clone) of the hash object. This can be used to
efficiently compute the digests of strings that share a common efficiently compute the digests of strings that share a common
initial substring. initial substring.
...@@ -54,11 +53,11 @@ More condensed: ...@@ -54,11 +53,11 @@ More condensed:
def __get_builtin_constructor(name): def __get_builtin_constructor(name):
if name in ('SHA1', 'sha1'): if name in ('SHA1', 'sha1'):
import _sha import _sha1
return _sha.new return _sha1.sha1
elif name in ('MD5', 'md5'): elif name in ('MD5', 'md5'):
import _md5 import _md5
return _md5.new return _md5.md5
elif name in ('SHA256', 'sha256', 'SHA224', 'sha224'): elif name in ('SHA256', 'sha256', 'SHA224', 'sha224'):
import _sha256 import _sha256
bs = name[3:] bs = name[3:]
...@@ -78,7 +77,7 @@ def __get_builtin_constructor(name): ...@@ -78,7 +77,7 @@ def __get_builtin_constructor(name):
def __py_new(name, data=b''): def __py_new(name, data=b''):
"""new(name, data='') - Return a new hashing object using the named algorithm; """new(name, data=b'') - Return a new hashing object using the named algorithm;
optionally initialized with data (which must be bytes). optionally initialized with data (which must be bytes).
""" """
return __get_builtin_constructor(name)(data) return __get_builtin_constructor(name)(data)
......
This diff is collapsed.
This diff is collapsed.
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
Greg Stein (gstein@lyra.org) Greg Stein (gstein@lyra.org)
Trevor Perrin (trevp@trevp.net) Trevor Perrin (trevp@trevp.net)
Copyright (C) 2005 Gregory P. Smith (greg@electricrain.com) Copyright (C) 2005-2007 Gregory P. Smith (greg@krypto.org)
Licensed to PSF under a Contributor Agreement. Licensed to PSF under a Contributor Agreement.
*/ */
...@@ -103,7 +103,7 @@ static void SHAcopy(SHAobject *src, SHAobject *dest) ...@@ -103,7 +103,7 @@ static void SHAcopy(SHAobject *src, SHAobject *dest)
* The library is free for all purposes without any express * The library is free for all purposes without any express
* gurantee it works. * gurantee it works.
* *
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org * Tom St Denis, tomstdenis@iahu.ca, http://libtom.org
*/ */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
Greg Stein (gstein@lyra.org) Greg Stein (gstein@lyra.org)
Trevor Perrin (trevp@trevp.net) Trevor Perrin (trevp@trevp.net)
Copyright (C) 2005 Gregory P. Smith (greg@electricrain.com) Copyright (C) 2005-2007 Gregory P. Smith (greg@krypto.org)
Licensed to PSF under a Contributor Agreement. Licensed to PSF under a Contributor Agreement.
*/ */
...@@ -113,7 +113,7 @@ static void SHAcopy(SHAobject *src, SHAobject *dest) ...@@ -113,7 +113,7 @@ static void SHAcopy(SHAobject *src, SHAobject *dest)
* The library is free for all purposes without any express * The library is free for all purposes without any express
* gurantee it works. * gurantee it works.
* *
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org * Tom St Denis, tomstdenis@iahu.ca, http://libtom.org
*/ */
......
...@@ -618,6 +618,11 @@ class PyBuildExt(build_ext): ...@@ -618,6 +618,11 @@ class PyBuildExt(build_ext):
exts.append( Extension('_sha256', ['sha256module.c']) ) exts.append( Extension('_sha256', ['sha256module.c']) )
exts.append( Extension('_sha512', ['sha512module.c']) ) exts.append( Extension('_sha512', ['sha512module.c']) )
if not openssl_ver:
# no openssl at all, use our own md5 and sha1
exts.append( Extension('_md5', ['md5module.c']) )
exts.append( Extension('_sha1', ['sha1module.c']) )
# Modules that provide persistent dictionary-like semantics. You will # Modules that provide persistent dictionary-like semantics. You will
# probably want to arrange for at least one of them to be available on # probably want to arrange for at least one of them to be available on
# your machine, though none are defined by default because of library # your machine, though none are defined by default because of library
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment