Google Git
Sign in
android / platform / system / keymaster / 31eaa48123bd3bf0a5603ab908cfe9987c2c5ea9
commit31eaa48123bd3bf0a5603ab908cfe9987c2c5ea9[log] [tgz]
authorChad Brubaker <cbrubaker@google.com>Thu Jun 04 10:19:32 2015 -0700
committerShawn Willden <swillden@google.com>Thu Jul 09 11:05:11 2015 -0600
tree7a005d388146feab3e6f2c61b6f16e17f67ab986
parentda64371575b42ddc54b7b7f3ce52e04aafac55a5 [diff]
Fix missing delete_keypair and delete_all

delete_keypair and delete_all always existed in SoftKeymasterDevice and
always returned an error, this causes keystore's delete to fail because
it gives the impression the key was unable to be deleted.

Instead SoftKeymasterDevice will track these two optional methods, if
they exist int the underlying device then SoftKeymasterDevice will
expose them and simply pass though, otherwise the methods will be null
in the SoftKeymasterDevice's device.

Cherry-picked from internal.

Bug: 21634519
Change-Id: I5ecb86644d5a3b6a517aa040b08b0902443e5be1
1 file changed
tree: 7a005d388146feab3e6f2c61b6f16e17f67ab986
  1. include/
  2. .clang-format
  3. .gitignore
  4. ae.h
  5. aes_key.cpp
  6. aes_key.h
  7. aes_operation.cpp
  8. aes_operation.h
  9. Android.mk
  10. android_keymaster.cpp
  11. android_keymaster_messages.cpp
  12. android_keymaster_messages_test.cpp
  13. android_keymaster_test.cpp
  14. android_keymaster_test_utils.cpp
  15. android_keymaster_test_utils.h
  16. android_keymaster_utils.cpp
  17. asymmetric_key.cpp
  18. asymmetric_key.h
  19. asymmetric_key_factory.cpp
  20. auth_encrypted_key_blob.cpp
  21. auth_encrypted_key_blob.h
  22. authorization_set.cpp
  23. authorization_set_test.cpp
  24. ec_key.cpp
  25. ec_key.h
  26. ec_key_factory.cpp
  27. ec_keymaster0_key.cpp
  28. ec_keymaster0_key.h
  29. ec_privkey_pk8.der
  30. ecdsa_operation.cpp
  31. ecdsa_operation.h
  32. gtest_main.cpp
  33. hkdf.cpp
  34. hkdf.h
  35. hkdf_test.cpp
  36. hmac.cpp
  37. hmac.h
  38. hmac_key.cpp
  39. hmac_key.h
  40. hmac_operation.cpp
  41. hmac_operation.h
  42. hmac_test.cpp
  43. integrity_assured_key_blob.cpp
  44. integrity_assured_key_blob.h
  45. key.cpp
  46. key.h
  47. key_blob_test.cpp
  48. keymaster0_engine.cpp
  49. keymaster0_engine.h
  50. keymaster_enforcement.cpp
  51. keymaster_enforcement_test.cpp
  52. km0_sw_rsa_512.blob
  53. km1_sw_ecdsa_256.blob
  54. km1_sw_rsa_512.blob
  55. km1_sw_rsa_512_unversioned.blob
  56. logger.cpp
  57. Makefile
  58. ocb.c
  59. ocb_utils.cpp
  60. ocb_utils.h
  61. openssl_err.cpp
  62. openssl_err.h
  63. openssl_utils.cpp
  64. openssl_utils.h
  65. operation.cpp
  66. operation.h
  67. operation_table.cpp
  68. operation_table.h
  69. rsa_key.cpp
  70. rsa_key.h
  71. rsa_key_factory.cpp
  72. rsa_keymaster0_key.cpp
  73. rsa_keymaster0_key.h
  74. rsa_operation.cpp
  75. rsa_operation.h
  76. rsa_privkey_pk8.der
  77. serializable.cpp
  78. soft_keymaster_context.cpp
  79. soft_keymaster_device.cpp
  80. soft_keymaster_logger.cpp
  81. symmetric_key.cpp
  82. symmetric_key.h
  83. valgrind.supp