Commit 926d41f0 authored by Tim Graham's avatar Tim Graham
Browse files

Updated some comments for BCryptSHA256PasswordHasher.

parent 46ecfb9b

django/contrib/auth/hashers.py

+8 −11
Original line number Diff line number Diff line
@@ -290,14 +290,11 @@ class BCryptSHA256PasswordHasher(BasePasswordHasher): 


    def encode(self, password, salt):

        bcrypt = self._load_library()

        # Need to reevaluate the force_bytes call once bcrypt is supported on

        # Python 3



        # Hash the password prior to using bcrypt to prevent password truncation

        #   See: https://code.djangoproject.com/ticket/20138

        # Hash the password prior to using bcrypt to prevent password

        # truncation as described in #20138.

        if self.digest is not None:

            # We use binascii.hexlify here because Python3 decided that a hex encoded

            #   bytestring is somehow a unicode.

            # Use binascii.hexlify() because a hex encoded bytestring is

            # Unicode on Python 3.

            password = binascii.hexlify(self.digest(force_bytes(password)).digest())

        else:

            password = force_bytes(password)
@@ -310,11 +307,11 @@ class BCryptSHA256PasswordHasher(BasePasswordHasher): 
        assert algorithm == self.algorithm

        bcrypt = self._load_library()



        # Hash the password prior to using bcrypt to prevent password truncation

        #   See: https://code.djangoproject.com/ticket/20138

        # Hash the password prior to using bcrypt to prevent password

        # truncation as described in #20138.

        if self.digest is not None:

            # We use binascii.hexlify here because Python3 decided that a hex encoded

            #   bytestring is somehow a unicode.

            # Use binascii.hexlify() because a hex encoded bytestring is

            # Unicode on Python 3.

            password = binascii.hexlify(self.digest(force_bytes(password)).digest())

        else:

            password = force_bytes(password)