Gitiles
Code Review Sign In
review.blissroms.org / platform_system_keymaster / fe79c74e65017af451f33f495984a649a4e44a22
commitfe79c74e65017af451f33f495984a649a4e44a22[log] [tgz]
authorShawn Willden <swillden@google.com>Thu Aug 13 21:13:23 2015 -0600
committerShawn Willden <swillden@google.com>Thu Aug 13 21:13:23 2015 -0600
tree2bf64c790c2272d1ef6a7f7af95b0117d21b5577
parent3adb582b499a4cc85e12db98246180f6a20578a9 [diff]
parentd599b15c0693950bdc72fb867872044fdc484ef5 [diff]
resolved conflicts for merge of d599b15c to mnc-dr-dev-plus-aosp

Change-Id: I348f3a4860f6a97c818ae7f02dc65e9336da02b8
tree: 2bf64c790c2272d1ef6a7f7af95b0117d21b5577
  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_keymaster1_key.cpp
  30. ec_keymaster1_key.h
  31. ec_privkey_pk8.der
  32. ecdsa_keymaster1_operation.cpp
  33. ecdsa_keymaster1_operation.h
  34. ecdsa_operation.cpp
  35. ecdsa_operation.h
  36. gtest_main.cpp
  37. hkdf.cpp
  38. hkdf.h
  39. hkdf_test.cpp
  40. hmac.cpp
  41. hmac.h
  42. hmac_key.cpp
  43. hmac_key.h
  44. hmac_operation.cpp
  45. hmac_operation.h
  46. hmac_test.cpp
  47. integrity_assured_key_blob.cpp
  48. integrity_assured_key_blob.h
  49. key.cpp
  50. key.h
  51. key_blob_test.cpp
  52. keymaster0_engine.cpp
  53. keymaster0_engine.h
  54. keymaster1_engine.cpp
  55. keymaster1_engine.h
  56. keymaster_enforcement.cpp
  57. keymaster_enforcement_test.cpp
  58. km0_sw_rsa_512.blob
  59. km1_sw_ecdsa_256.blob
  60. km1_sw_rsa_512.blob
  61. km1_sw_rsa_512_unversioned.blob
  62. List.h
  63. logger.cpp
  64. Makefile
  65. ocb.c
  66. ocb_utils.cpp
  67. ocb_utils.h
  68. openssl_err.cpp
  69. openssl_err.h
  70. openssl_utils.cpp
  71. openssl_utils.h
  72. operation.cpp
  73. operation.h
  74. operation_table.cpp
  75. operation_table.h
  76. rsa_key.cpp
  77. rsa_key.h
  78. rsa_key_factory.cpp
  79. rsa_keymaster0_key.cpp
  80. rsa_keymaster0_key.h
  81. rsa_keymaster1_key.cpp
  82. rsa_keymaster1_key.h
  83. rsa_keymaster1_operation.cpp
  84. rsa_keymaster1_operation.h
  85. rsa_operation.cpp
  86. rsa_operation.h
  87. rsa_privkey_pk8.der
  88. serializable.cpp
  89. soft_keymaster_context.cpp
  90. soft_keymaster_device.cpp
  91. soft_keymaster_logger.cpp
  92. symmetric_key.cpp
  93. symmetric_key.h
  94. valgrind.supp