summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2012-01-19 00:21:25 -0500
committerEli Collins <elic@assurancetechnologies.com>2012-01-19 00:21:25 -0500
commit4c4615329b64287dabd729e3078ab03cb2bb7442 (patch)
tree5c9172e4438b7c6a99e5e3a28d14c57594c5d0a6
parent212a0fc03a2b2fe318db57855ab0fd8d4f401166 (diff)
downloadpasslib-4c4615329b64287dabd729e3078ab03cb2bb7442.tar.gz
minor updates
-rw-r--r--CHANGES4
-rw-r--r--passlib/handlers/sun_md5_crypt.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 247fd16..2b94b98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,10 @@ Release History
hash in Passlib, though it offers no particular advantages
outside of this special case.
+ * Fixed rare ``'NoneType' object has no attribute 'decode'`` error
+ that sometimes occurred on platforms with a deviant implementation
+ of :func:`!os_crypt`.
+
CryptContext
.. currentmodule:: passlib.context
diff --git a/passlib/handlers/sun_md5_crypt.py b/passlib/handlers/sun_md5_crypt.py
index 1a93c41..7bc5e4d 100644
--- a/passlib/handlers/sun_md5_crypt.py
+++ b/passlib/handlers/sun_md5_crypt.py
@@ -262,7 +262,7 @@ class sun_md5_crypt(uh.HasRounds, uh.HasSalt, uh.GenericHandler):
if rstr != unicode(rounds):
raise ValueError("invalid sun-md5-crypt hash (zero-padded rounds)")
if rounds == 0:
- #NOTE: not sure if this is *forbidden* precisely,
+ #NOTE: not sure if this is forbidden by spec or not;
# but allowing it would complicate things,
# and it should never occur anyways.
raise ValueError("invalid sun-md5-crypt hash (explicit zero rounds)")