| author | chao.liu <chao.liu@amlogic.com> | 2017-12-05 13:02:31 (GMT) |
|---|---|---|
| committer | Pengguang Zhu <pengguang.zhu@amlogic.com> | 2017-12-05 13:24:12 (GMT) |
| commit | e1a19015ddef288fb04dc7bd53f4b1ba7ecf6597 (patch) | |
| tree | d84b7629e98f42c3eed8b97bf1640ed9f4321397 | |
| parent | 53720211859e85febebc685d0c36f94cdbdea09a (diff) | |
| download | tdk-e1a19015ddef288fb04dc7bd53f4b1ba7ecf6597.zip tdk-e1a19015ddef288fb04dc7bd53f4b1ba7ecf6597.tar.gz tdk-e1a19015ddef288fb04dc7bd53f4b1ba7ecf6597.tar.bz2 | |
script: fix python sign_ta error
Change-Id: I0eb0828405001c8b9bcc3348248d57c1f7d4c8fa
Signed-off-by: chao.liu <chao.liu@amlogic.com>
| -rwxr-xr-x | ta_export/scripts/sign_ta.py | 10 | ||||
| -rwxr-xr-x | ta_export/scripts/sign_ta_auto.py | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ta_export/scripts/sign_ta.py b/ta_export/scripts/sign_ta.py index f4c5593..c3b0fee 100755 --- a/ta_export/scripts/sign_ta.py +++ b/ta_export/scripts/sign_ta.py @@ -71,8 +71,12 @@ def main(): 0x0, 0x0, 0x0, 0x0) aes_iv = struct.pack('<IIII', \ 0x0, 0x0, 0x0, 0x0) - enc_aes_key = aes_key - enc_aes_key_len = len(enc_aes_key) + 2 * len(aes_iv) + enc_aes_key = struct.pack('<IIIIIIIIIIIIIIII', \ + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0) + enc_aes_key_len = len(enc_aes_key) else: aes_key_type = 2 f = open(args.ta_aes_key, 'rb') @@ -156,8 +160,6 @@ def main(): f = open(args.out, 'wb') f.write(shdr) f.write(enc_aes_key) - skip_len = shdr_len + enc_aes_key_len - f.seek(skip_len) f.write(h_elf.digest()) f.write(sig_ta) diff --git a/ta_export/scripts/sign_ta_auto.py b/ta_export/scripts/sign_ta_auto.py index 3dd331b..bccbea3 100755 --- a/ta_export/scripts/sign_ta_auto.py +++ b/ta_export/scripts/sign_ta_auto.py @@ -66,9 +66,9 @@ def main(): cmd2.extend(["--ta_rsa_key_sig=" + target_path + "/ta_rsa_key.sig"]) if args.encrypt != 0: cmd2.extend(["--ta_aes_key=" + file_path + "/../keys/ta_aes_key.bin"]) + cmd2.extend(["--ta_aes_iv=" + file_path + "/../keys/ta_aes_iv.bin"]) + cmd2.extend(["--ta_aes_key_iv_enc=" + target_path + "/ta_aes_key_enc.bin"]) - cmd2.extend(["--ta_aes_iv=" + file_path + "/../keys/ta_aes_iv.bin"]) - cmd2.extend(["--ta_aes_key_iv_enc=" + target_path + "/ta_aes_key_enc.bin"]) cmd2.extend(["--in=" + args.inf]) cmd2.extend(["--out=" + args.out]) sub = subprocess.Popen(cmd2) |