Change the default parameter values in common.MakeTempFile().

tempfile.TemporaryFile() complains when 'None' is passed as the
prefix/suffix. It uses prefix='tmp' and suffix='' as the default values
and we should do the same.

Test: Call check_ota_package_signature.py and ota_from_target_files.py
and they still work.

Change-Id: I7fb023a3fd0b1a57c009631d0c57a7bb8e4cb5a3
This commit is contained in:
Tao Bao 2016-09-19 13:54:38 -07:00
parent 3b0cb6e842
commit 4c851b1098
2 changed files with 4 additions and 4 deletions

View File

@ -104,7 +104,7 @@ def verify_package(cert, package):
# Get the signature from the input package.
signature = package_bytes[signature_start:-6]
sig_file = common.MakeTempFile(prefix='sig-', suffix='')
sig_file = common.MakeTempFile(prefix='sig-')
with open(sig_file, 'wb') as f:
f.write(signature)
@ -116,12 +116,12 @@ def verify_package(cert, package):
digest_line = sig.strip().split('\n')[-1]
digest_string = digest_line.split(':')[3]
digest_file = common.MakeTempFile(prefix='digest-', suffix='')
digest_file = common.MakeTempFile(prefix='digest-')
with open(digest_file, 'wb') as f:
f.write(digest_string.decode('hex'))
# Verify the digest by outputing the decrypted result in ASN.1 structure.
decrypted_file = common.MakeTempFile(prefix='decrypted-', suffix='')
decrypted_file = common.MakeTempFile(prefix='decrypted-')
cmd = ['openssl', 'rsautl', '-verify', '-certin', '-inkey', cert,
'-in', digest_file, '-out', decrypted_file]
p1 = common.Run(cmd, stdout=subprocess.PIPE)

View File

@ -990,7 +990,7 @@ def ParseOptions(argv,
return args
def MakeTempFile(prefix=None, suffix=None):
def MakeTempFile(prefix='tmp', suffix=''):
"""Make a temp file and add it to the list of things to be deleted
when Cleanup() is called. Return the filename."""
fd, fn = tempfile.mkstemp(prefix=prefix, suffix=suffix)