From: Apprentice Harper <apprenticeharper@gmail.com>
Date: Thu, 30 Jan 2020 12:04:00 +0000 (+0000)
Subject: Merge pull request #848 from sretlawd/kfx_dsn_fix
X-Git-Url: http://git.xmof.duckdns.org/?a=commitdiff_plain;h=69ac9b7399edfe4f7c5b450a2f065d954e94f4ad;p=DeDRM.git

Merge pull request #848 from sretlawd/kfx_dsn_fix

Allow decryption with DSN only.
---

69ac9b7399edfe4f7c5b450a2f065d954e94f4ad
diff --cc dedrm_src/kfxdedrm.py
index aed38d9,4648893..1520f79
--- a/dedrm_src/kfxdedrm.py
+++ b/dedrm_src/kfxdedrm.py
@@@ -66,10 -65,10 +66,10 @@@ class KFXZipBook
              else:
                  raise Exception(u'The .kfx-zip archive contains an encrypted DRMION file without a DRM voucher')
  
 -        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 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:
                      break       # split pid into DSN and account secret
              else: