Merge pull request #848 from sretlawd/kfx_dsn_fix

Allow decryption with DSN only.
This commit is contained in:
Apprentice Harper 2020-01-30 12:04:00 +00:00 committed by GitHub
commit 69ac9b7399
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -69,7 +69,7 @@ class KFXZipBook:
print(u'Decrypting KFX DRM voucher: {0}'.format(info.filename)) print(u'Decrypting KFX DRM voucher: {0}'.format(info.filename))
for pid in [''] + totalpids: for pid in [''] + totalpids:
for dsn_len,secret_len in [(0,0), (16,0), (16,40), (32,40), (40,40)]: for dsn_len,secret_len in [(0,0), (16,0), (16,40), (32,40), (40,0), (40,40)]:
if len(pid) == dsn_len + secret_len: if len(pid) == dsn_len + secret_len:
break # split pid into DSN and account secret break # split pid into DSN and account secret
else: else: