tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp

Browse source 
Change-Id: I2d06f0cec793185533ef2fc78428dfd99815030c
This commit is contained in:
Tao Bao 2016-06-23 19:48:40 -07:00
commit b79e31756b
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/releasetools/ota_from_target_files.py
View file

@ -116,6 +116,9 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
directly, a payload signer that knows how to do that should be specified.
The signer will be supplied with "-inkey <path_to_key>",
"-in <input_file>" and "-out <output_file>" parameters.
--payload_signer_args <args>
Specify the arguments needed for payload signer.
"""
import sys
@ -127,6 +130,7 @@ if sys.hexversion < 0x02070000:
import multiprocessing
import os
import subprocess
import shlex
import tempfile
import zipfile
@ -163,6 +167,7 @@ OPTIONS.stash_threshold = 0.8
OPTIONS.gen_verify = False
OPTIONS.log_diff = None
OPTIONS.payload_signer = None
OPTIONS.payload_signer_args = []
def MostPopularKey(d, default):
"""Given a dict, return the key corresponding to the largest
@ -1250,8 +1255,8 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
suffix=".bin")
# 3a. Sign the payload hash.
if OPTIONS.payload_signer is not None:
cmd = [OPTIONS.payload_signer,
"-inkey", OPTIONS.package_key + OPTIONS.private_key_suffix]
cmd = [OPTIONS.payload_signer]
cmd.extend(OPTIONS.payload_signer_args)
else:
cmd = ["openssl", "pkeyutl", "-sign",
"-inkey", rsa_key,
@ -1264,8 +1269,8 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
# 3b. Sign the metadata hash.
if OPTIONS.payload_signer is not None:
cmd = [OPTIONS.payload_signer,
"-inkey", OPTIONS.package_key + OPTIONS.private_key_suffix]
cmd = [OPTIONS.payload_signer]
cmd.extend(OPTIONS.payload_signer_args)
else:
cmd = ["openssl", "pkeyutl", "-sign",
"-inkey", rsa_key,
@ -1937,6 +1942,8 @@ def main(argv):
OPTIONS.log_diff = a
elif o == "--payload_signer":
OPTIONS.payload_signer = a
elif o == "--payload_signer_args":
OPTIONS.payload_signer_args = shlex.split(a)
else:
return False
return True
@ -1966,6 +1973,7 @@ def main(argv):
"gen_verify",
"log_diff=",
"payload_signer=",
"payload_signer_args=",
], extra_option_handler=option_handler)
if len(args) != 2: