diff options
author | Eli Collins <elic@assurancetechnologies.com> | 2012-03-12 22:44:22 -0400 |
---|---|---|
committer | Eli Collins <elic@assurancetechnologies.com> | 2012-03-12 22:44:22 -0400 |
commit | e89ebdf93b92dc018bd3ee1542cc4416b5024ab4 (patch) | |
tree | 49afbf5441e910c2667dd0cb1e8a075467ad857d /passlib/utils | |
parent | ca830cd76a655f20488aebd082aba1a320e230d0 (diff) | |
download | passlib-e89ebdf93b92dc018bd3ee1542cc4416b5024ab4.tar.gz |
bcrypt work
* added code to shoehorn $2$-support wrapper for bcryptor backend
* added PasslibSecurityWarning when builtin backend is enabled
(still considered whether it should be enabled by default)
* py3 compat fix for repair_unused
Diffstat (limited to 'passlib/utils')
-rw-r--r-- | passlib/utils/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/passlib/utils/__init__.py b/passlib/utils/__init__.py index 6d26d91..24173f7 100644 --- a/passlib/utils/__init__.py +++ b/passlib/utils/__init__.py @@ -974,11 +974,14 @@ class Base64Engine(object): if isinstance(source, unicode): cm = self.charmap last = cm[cm.index(last) & mask] + assert last in padset, "failed to generate valid padding char" else: # NOTE: this assumes ascii-compat encoding, and that # all chars used by encoding are 7-bit ascii. last = self._encode64(self._decode64(last) & mask) - assert last in padset, "failed to generate valid padding char" + assert last in padset, "failed to generate valid padding char" + if PY3: + last = bytes([last]) return True, source[:-1] + last def repair_unused(self, source): |