diff options
author | Chad Brubaker <cbrubaker@google.com> | 2015-06-18 03:26:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-18 03:26:13 +0000 |
commit | 84c14f0957b365fd33534b88b7eec97b287b67b9 (patch) | |
tree | 4331b0f0b91899a5cca2f32bddbb178d6e111f5b | |
parent | b2ffa420da26414379b31807eec76ec8c9f3b0a9 (diff) | |
parent | df70517b8d85b30e6ac7001ec68348f07d5129cb (diff) | |
download | android_system_security-84c14f0957b365fd33534b88b7eec97b287b67b9.tar.gz android_system_security-84c14f0957b365fd33534b88b7eec97b287b67b9.tar.bz2 android_system_security-84c14f0957b365fd33534b88b7eec97b287b67b9.zip |
Merge "Remove exist check from doLegacySignVerify" into mnc-dev
-rw-r--r-- | keystore/keystore.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp index 33fb499..ae3b1e4 100644 --- a/keystore/keystore.cpp +++ b/keystore/keystore.cpp @@ -2974,10 +2974,6 @@ private: uint8_t** out, size_t* outLength, const uint8_t* signature, size_t signatureLength, keymaster_purpose_t purpose) { - if (exist(name, IPCThreadState::self()->getCallingUid()) != ::NO_ERROR) { - ALOGW("Key not found"); - return ::KEY_NOT_FOUND; - } std::basic_stringstream<uint8_t> outBuffer; OperationResult result; KeymasterArguments inArgs; @@ -2987,7 +2983,11 @@ private: begin(appToken, name, purpose, true, inArgs, NULL, 0, &result); if (result.resultCode != ResponseCode::NO_ERROR) { - ALOGW("Error in begin: %d", result.resultCode); + if (result.resultCode == ::KEY_NOT_FOUND) { + ALOGW("Key not found"); + } else { + ALOGW("Error in begin: %d", result.resultCode); + } return translateResultToLegacyResult(result.resultCode); } inArgs.params.clear(); |