[backend] add BSTUF::key2keyid helper

This calculates a TUF key id from a TUF key
openSUSE · Nov 14, 2018 · 902d7c5 · 902d7c5
1 parent 2df12b0
commit 902d7c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/backend/BSPublisher/Registry.pm b/src/backend/BSPublisher/Registry.pm
@@ -261,8 +261,8 @@ sub update_tuf {
     'keytype' => 'rsa',
     'keyval' => { 'private' => undef, 'public' => $tuf->{'timestamp_pubkey'} },
   };
-  my $root_key_id = Digest::SHA::sha256_hex(BSTUF::canonical_json($root_key));
-  my $timestamp_key_id = Digest::SHA::sha256_hex(BSTUF::canonical_json($timestamp_key));
+  my $root_key_id = BSTUF::key2keyid($root_key);
+  my $timestamp_key_id = BSTUF::key2keyid($timestamp_key);
 
   #
   # setup root 

diff --git a/src/backend/BSTUF.pm b/src/backend/BSTUF.pm
@@ -51,6 +51,10 @@ sub canonical_json {
   return JSON::XS->new->utf8->canonical->encode($d);
 }
 
+sub key2keyid {
+  return Digest::SHA::sha256_hex(canonical_json($_[0]));
+}
+
 sub sign {
   my ($data, $signargs) = @_;
   return BSUtil::xsystem($data, $BSConfig::sign, @$signargs, '-O', '-h', 'sha256');