Google Git
Sign in
android / trusty / app / keymaster / febf8e62563008075b1c6c8b2c1fb3f0d01cc0da
commitfebf8e62563008075b1c6c8b2c1fb3f0d01cc0da[log] [tgz]
authorShawn Willden <swillden@google.com>Wed Jun 02 13:52:39 2021 -0600
committerShawn Willden <swillden@google.com>Wed Jun 02 13:52:39 2021 -0600
tree90e58285fb1285aab790ce034cb692f40454159e
parentb0381209436ea74397087f6c85eedc0b0b7f3d33 [diff]
Correct handling of keystore-prefixed blobs.

keystore2 adds some blob prefixes to TrustyKeymaster key blobs, with a
byte to indicate whether the blob is hardware-backed or a software
blob.  The Trusty KeymasterContext had the values of this indicator
byte inverted, causing Trusty KeyMint to interpret software blobs as
hardware and vice versa, making it incapable of using either.

Bug: 177729159
Test: VtsAidlKeyMintTargetTest
Change-Id: I26083e7d375c9dc85966181508c3611eadc16c14
1 file changed
tree: 90e58285fb1285aab790ce034cb692f40454159e
  1. atap/
  2. device_unittest/
  3. host_unittest/
  4. ipc/
  5. .clang-format
  6. build-config-usertests
  7. keymaster_attributes.pb.c
  8. keymaster_attributes.pb.h
  9. keymaster_attributes.proto
  10. LICENSE
  11. manifest.json
  12. openssl_keymaster_enforcement.cpp
  13. openssl_keymaster_enforcement.h
  14. OWNERS
  15. PREUPLOAD.cfg
  16. rules.mk
  17. secure_storage_manager.cpp
  18. secure_storage_manager.h
  19. trusty_aes_key.cpp
  20. trusty_aes_key.h
  21. trusty_keymaster.cpp
  22. trusty_keymaster.h
  23. trusty_keymaster_context.cpp
  24. trusty_keymaster_context.h
  25. trusty_keymaster_enforcement.cpp
  26. trusty_keymaster_enforcement.h
  27. trusty_keymaster_messages.h
  28. trusty_logger.h
  29. usertests-inc.mk