Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32961d02 authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge changes I6f61a908,Iafd22881 

* changes:
  fsverity_metadata: Support PEM key
  Add fsverity_metadata_generator helper binary
parents 46c84eda 06749298

tools/releasetools/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -553,6 +553,19 @@ python_binary_host { 
    ],

}



python_binary_host {

    name: "fsverity_metadata_generator",

    srcs: [

        "fsverity_metadata_generator.py",

    ],

    libs: [

        "fsverity_digests_proto_python",

    ],

    required: [

        "fsverity",

    ],

}



//

// Tests.

//

tools/releasetools/fsverity_metadata_generator.py

+21 −9
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ class FSVerityMetadataGenerator: 
    self.set_hash_alg("sha256")

    self.set_signature('none')



  def set_key_format(self, key_format):

    self._key_format = key_format



  def set_key(self, key):

    self._key = key
@@ -130,7 +133,8 @@ class FSVerityMetadataGenerator: 
      cmd.append(input_file)

      cmd.append(sig_file)



      # convert DER private key to PEM

      # If key is DER, convert DER private key to PEM

      if self._key_format == 'der':

        pem_key = os.path.join(work_dir, 'key.pem')

        key_cmd = ['openssl', 'pkcs8']

        key_cmd.extend(['-inform', 'DER'])
@@ -138,6 +142,8 @@ class FSVerityMetadataGenerator: 
        key_cmd.extend(['-nocrypt'])

        key_cmd.extend(['-out', pem_key])

        subprocess.check_call(key_cmd)

      else:

        pem_key = self._key



      cmd.extend(['--key', pem_key])

      cmd.extend(['--cert', self._cert])
@@ -195,9 +201,14 @@ if __name__ == '__main__': 
  p.add_argument(

      'input',

      help='input file to be signed')

  p.add_argument(

      '--key-format',

      choices=['pem', 'der'],

      default='der',

      help='format of the input key. Default is der')

  p.add_argument(

      '--key',

      help='PKCS#8 private key file in DER format')

      help='PKCS#8 private key file')

  p.add_argument(

      '--cert',

      help='x509 certificate file in PEM format')
@@ -227,5 +238,6 @@ if __name__ == '__main__': 
      raise ValueError("To generate signature, key and cert must be set")

    generator.set_key(args.key)

    generator.set_cert(args.cert)

  generator.set_key_format(args.key_format)

  generator.set_hash_alg(args.hash_alg)

  generator.generate(args.input, args.output)