commit a4b40020ef5ae339e19b832f441c26b598f6c4aa
author Jocelyn Bohr <bohr@google.com> Tue Apr 11 16:52:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 11 16:52:45 2017 +0000
tree 855a2a120ee744b8c5228082004bb61ff8583dc4
parent b37312a794971d3b24f256b4b76d8ea170fc453d
parent 502060311670688efde282f220a469480032e967

Merge changes from topic 'trusty_km2_hal'

* changes:
  trusty: keymaster: update device tests to use 2.0 API
  trusty: keymaster: Implement abort
  trusty: keymaster: Implement finish
  trusty: keymaster: Implement update
  trusty: keymaster: Implement begin
  trusty: keymaster: Implement upgrade_key
  trusty: keymaster: Implement attest_key
  trusty: keymaster: Implement export_key
  trusty: keymaster: Implement import_key
  trusty: keymaster: Implement get_key_characteristics
  trusty: keymaster: Implement generate_key
  trusty: keymaster: Implement add_rng_entropy
  trusty: keymaster: Implement configure
  trusty: keymaster: Begin update from Keymaster 0.3 to 2.0