Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

remove scrypt requirement, use hashlib.scrypt instead

Browse source
This commit is contained in:
jesopo 2021-03-07 15:36:17 +00:00
parent e645a32f93
commit e2fbbc2406
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
requirements.txt
View file

@ -11,7 +11,6 @@ PySocks ==1.7.1
python-dateutil ==2.8.1 python-dateutil ==2.8.1
pytz ==2019.2 pytz ==2019.2
requests ==2.22.0 requests ==2.22.0
scrypt ==0.8.13
suds-jurko ==0.6 suds-jurko ==0.6
tornado ==6.0.3 tornado ==6.0.3
tweepy ==3.8.0 tweepy ==3.8.0

11
src/utils/security.py
View file

@ -25,13 +25,20 @@ def ssl_wrap(sock: socket.socket, cert: str=None, key: str=None,
def constant_time_compare(a: typing.AnyStr, b: typing.AnyStr) -> bool: def constant_time_compare(a: typing.AnyStr, b: typing.AnyStr) -> bool:
return hmac.compare_digest(a, b) return hmac.compare_digest(a, b)
import scrypt import hashlib
def password(byte_n: int=32) -> str: def password(byte_n: int=32) -> str:
return binascii.hexlify(os.urandom(byte_n)).decode("utf8") return binascii.hexlify(os.urandom(byte_n)).decode("utf8")
def salt(byte_n: int=64) -> str: def salt(byte_n: int=64) -> str:
return base64.b64encode(os.urandom(byte_n)).decode("utf8") return base64.b64encode(os.urandom(byte_n)).decode("utf8")
def hash(given_salt: str, data: str): def hash(given_salt: str, data: str):
return base64.b64encode(scrypt.hash(data, given_salt)).decode("utf8") hash = hashlib.scrypt(
data.encode("utf8"),
salt=given_salt.encode("utf8"),
n=1<<14,
r=8,
p=1
)
return base64.b64encode(hash).decode("ascii")
def hash_verify(salt: str, data: str, compare: str): def hash_verify(salt: str, data: str, compare: str):
given_hash = hash(salt, data) given_hash = hash(salt, data)
return constant_time_compare(given_hash, compare) return constant_time_compare(given_hash, compare)