summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-26 01:03:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-26 01:03:48 +0000
commitab2e84517761232e458d7b54c79f5158a94f709b (patch)
tree085c1840611fef55dae61458f69b1ddc2c82d6a6
parent4a67a4e1939347acfe4cc7cd3ee0c4bb84543096 (diff)
parent2934d557ea9b55c41001dccc7f699901ea21b7dd (diff)
downloadplatform_system_apex-ab2e84517761232e458d7b54c79f5158a94f709b.tar.gz
platform_system_apex-ab2e84517761232e458d7b54c79f5158a94f709b.tar.bz2
platform_system_apex-ab2e84517761232e458d7b54c79f5158a94f709b.zip
Merge "Change the hashtree hash algorithm to sha256" into rvc-dev
-rw-r--r--apexer/apexer.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py
index 7a114d4f..f698c8c8 100644
--- a/apexer/apexer.py
+++ b/apexer/apexer.py
@@ -546,6 +546,7 @@ def CreateApex(args, work_dir):
cmd.append('add_hashtree_footer')
cmd.append('--do_not_generate_fec')
cmd.extend(['--algorithm', 'SHA256_RSA4096'])
+ cmd.extend(['--hash_algorithm', 'sha256'])
cmd.extend(['--key', args.key])
cmd.extend(['--prop', 'apex.key:' + key_name])
# Set up the salt based on manifest content which includes name