commit eedee7b8b5339d38ecd203b5b4849f496e352a35
author Shawn Willden <swillden@google.com> Wed Apr 29 04:48:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 29 04:48:34 2015 +0000
tree c8258ed0ca7f4cd8597d6b2f3e86b39dfcb8a70d
parent 3b4f027ba96d0b27bc25cfba3d0577f31d7c1786
parent 881618305cfecb783593bd7afd7a38ca616b36db

am 88161830: Merge "Add KM_ERROR_CALLER_NONCE_PROHIBITED error code."

* commit '881618305cfecb783593bd7afd7a38ca616b36db':
  Add KM_ERROR_CALLER_NONCE_PROHIBITED error code.

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 2b43f2c..9105ee9 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -347,6 +347,7 @@
     KM_ERROR_INVALID_NONCE = -52,
     KM_ERROR_UNSUPPORTED_CHUNK_LENGTH = -53,
     KM_ERROR_RESCOPABLE_KEY_NOT_USABLE = -54,
+    KM_ERROR_CALLER_NONCE_PROHIBITED = -55,
 
     KM_ERROR_UNIMPLEMENTED = -100,
     KM_ERROR_VERSION_MISMATCH = -101,