github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-15 09:42:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert Android App notification encryption to SHA1

Browse source
This commit is contained in:
JonnyWong16 2017-11-30 19:47:31 -08:00
parent 1235f73332
commit 6cae12d467
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plexpy/notifiers.py
View file

@ -36,7 +36,7 @@ try:
from Cryptodome.Protocol.KDF import PBKDF2 from Cryptodome.Protocol.KDF import PBKDF2
from Cryptodome.Cipher import AES from Cryptodome.Cipher import AES
from Cryptodome.Random import get_random_bytes from Cryptodome.Random import get_random_bytes
from Cryptodome.Hash import HMAC, SHA256 from Cryptodome.Hash import HMAC, SHA1
CRYPTODOME = True CRYPTODOME = True
except ImportError: except ImportError:
try: try:
@ -785,7 +785,7 @@ class ANDROIDAPP(Notifier):
key_length = 32 # AES256 key_length = 32 # AES256
iterations = 1000 iterations = 1000
key = PBKDF2(passphrase, salt, dkLen=key_length, count=iterations, key = PBKDF2(passphrase, salt, dkLen=key_length, count=iterations,
prf=lambda p, s: HMAC.new(p, s, SHA256).digest()) prf=lambda p, s: HMAC.new(p, s, SHA1).digest())
#logger.debug("Encryption key (base64): {}".format(base64.b64encode(key))) #logger.debug("Encryption key (base64): {}".format(base64.b64encode(key)))