Skip to content

Used encode() to convert objects to bytes-like #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Used encode() to convert objects to bytes-like #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions _practices/safe-password-storage/_python/generate_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ def __init__(self, salt=None, pepper=None, rounds=None):

def encode(self, password):
if self.salt is None:
return hashlib.md5(password).hexdigest()
# Added encode() to handle TypeError: Unicode-objects must be encoded before hashing
return hashlib.md5(password.encode()).hexdigest()
elif self.salt == 'same':
salt = self.global_salt
elif self.salt == 'user':
Expand Down Expand Up @@ -67,7 +68,8 @@ def __init__(self, salt=None, pepper=None, rounds=None):
raise NotImplementedError("BCRYPT NEEDS A SALT MORON")

self.salt = salt
self.pepper = pepper
# Added encode() to handle TypeError: can only concatenate str (not "bytes") to str
self.pepper = pepper.encode()

def encode(self, password):
if self.salt == 'same':
Expand Down