diff options
| author | nlscc <66028747+nlscc@users.noreply.github.com> | 2021-06-01 15:25:02 +0200 |
|---|---|---|
| committer | nlscc <66028747+nlscc@users.noreply.github.com> | 2021-06-01 15:25:02 +0200 |
| commit | 820375214f1b7b26109e5c3aea8d005fcc56eebf (patch) | |
| tree | 0768723ff218d2548e5155f484d8e9798756e16d /samloader/crypt.py | |
| parent | retire code of conduct (diff) | |
| download | samloader-820375214f1b7b26109e5c3aea8d005fcc56eebf.tar samloader-820375214f1b7b26109e5c3aea8d005fcc56eebf.tar.gz samloader-820375214f1b7b26109e5c3aea8d005fcc56eebf.tar.bz2 samloader-820375214f1b7b26109e5c3aea8d005fcc56eebf.tar.lz samloader-820375214f1b7b26109e5c3aea8d005fcc56eebf.tar.xz samloader-820375214f1b7b26109e5c3aea8d005fcc56eebf.tar.zst samloader-820375214f1b7b26109e5c3aea8d005fcc56eebf.zip | |
Diffstat (limited to 'samloader/crypt.py')
| -rw-r--r-- | samloader/crypt.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/samloader/crypt.py b/samloader/crypt.py index 0b57c5a..29611a6 100644 --- a/samloader/crypt.py +++ b/samloader/crypt.py @@ -8,8 +8,9 @@ import xml.etree.ElementTree as ET from Cryptodome.Cipher import AES from clint.textui import progress -from . import request from . import fusclient +from . import request +from . import versionfetch # PKCS#7 unpad unpad = lambda d: d[:-d[-1]] @@ -17,6 +18,7 @@ unpad = lambda d: d[:-d[-1]] def getv4key(version, model, region): """ Retrieve the AES key for V4 encryption. """ client = fusclient.FUSClient() + version = versionfetch.normalizevercode(version) req = request.binaryinform(version, model, region, client.nonce) resp = client.makereq("NF_DownloadBinaryInform.do", req) root = ET.fromstring(resp) |