Google Git
Sign in
android / platform / system / keymaster / refs/tags/android-6.0.1_r26
tagf98d892d916600e8ff7a19d25f6bc09ce37e633d
taggerThe Android Open Source Project <initial-contribution@android.com>Mon May 09 14:04:16 2016 -0700
object39ba76dc0fd9f516d8bcd76cf2d6251206316811 
Android 6.0.1 release 26 (MMB30G)
commit39ba76dc0fd9f516d8bcd76cf2d6251206316811[log] [tgz]
authorShawn Willden <swillden@google.com>Fri Oct 23 10:11:40 2015 -0600
committerThe Android Automerger <android-build@google.com>Tue Nov 03 14:35:22 2015 -0800
treee853546fbe63e8e96df47be8d12fc2fea5c7c99a
parent35619fd4b2c22d6584efb3de9d410f4a22c36306 [diff]
Return correct error from keymaster0engine for large RSA input

Also, ensure that we always put some error on the OpenSSL error queue
whenever a wrapped keymaster0 operation fails.  Higher layers will look
a the last entry on the queue and use it to determine what error code to
return.  Not putting any error on the queue means that those higher
layers will get whatever error was last enqueued, making the result
effectively random.  Non-determinism bad.

(cherry-picked from commit 22d2355b7edc470949c163e47ba8e837a1a87f47)

Bug: 25337630
Change-Id: I701ab735dd089f5258b2252f543906d9f3baa7a2
3 files changed
tree: e853546fbe63e8e96df47be8d12fc2fea5c7c99a
  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