Gitiles
Code Review Sign In
review.blissroms.org / platform_system_keymaster / 2ca6d3cb87c742836d268afacbefc43a37b8b913
commit2ca6d3cb87c742836d268afacbefc43a37b8b913[log] [tgz]
authorShawn Willden <swillden@google.com>Mon Jun 22 17:33:16 2015 -0600
committerShawn Willden <swillden@google.com>Mon Jun 22 17:33:16 2015 -0600
tree47bdd867406d8e9b458f5e9e11ec3e513593fe79
parent88eda8df59ff8dda2ae38b3dd28ab7b3439fa351 [diff]
parent0f906ec40f6ade7955c6b967ea522aade54ea2e4 [diff]
resolved conflicts for merge of 0f906ec4 to mnc-dev-plus-aosp

Change-Id: If1a88118695e5cfbbd10643ddd82d258d9e3b855
tree: 47bdd867406d8e9b458f5e9e11ec3e513593fe79
  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