make use of compat

mig/shared/compat.py

@@ -55,6 +55,12 @@ def _is_unicode(val):
     return (type(val) == _TYPE_UNICODE)
 
 
+def encode_unicode_string(unicode_string):
+    """Convert a unicode string value to bytes."""
+
+    return codecs.encode(unicode_string, 'utf8')
+
+
 def ensure_native_string(string_or_bytes):
     """Given a supplied input which can be either a string or bytes
     return a representation providing string operations while ensuring that

mig/shared/pwcrypto.py

@@ -44,6 +44,7 @@
 import time
 
 from mig.shared.base import force_utf8, mask_creds, string_snippet
+from mig.shared.compat import encode_unicode_string
 from mig.shared.defaults import keyword_auto, RESET_TOKEN_TTL
 
 
@@ -118,7 +119,7 @@ def best_crypt_salt(configuration):
 def make_hash(password, _urandom=urandom):
     """Generate a random salt and return a new hash for the password."""
     salt = b64encode(_urandom(SALT_LENGTH))
-    password_bytes = codecs.encode(password, 'utf8')
+    password_bytes = encode_unicode_string(password)
     password_hashed = hashlib.pbkdf2_hmac(HASH_FUNCTION,
                                             password_bytes, salt,
                                             COST_FACTOR, KEY_LENGTH)