summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanis Danisevskis <jdanis@google.com>2019-03-13 17:13:04 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-13 17:13:04 -0700
commitfe8e03bc80df090527024e30404d7529fe50469f (patch)
tree2d4e7acc3696ccc7017a97302983ef65975cb8e8
parenta48f7c0981b9979ef7b060610071b71a5f019878 (diff)
parentfcd8b15f2048b5e15dfe7c02474c4474f5878763 (diff)
downloadsecurity-fe8e03bc80df090527024e30404d7529fe50469f.tar.gz
Merge "keystore_backend_binder: fix misinterpretation of getKeyCharacteristics return value." am: 2cd64544e0
am: fcd8b15f20 Change-Id: I9eb61644485a7cc66407d4f2faf405e01b309511
-rw-r--r--keystore-engine/keystore_backend_binder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore-engine/keystore_backend_binder.cpp b/keystore-engine/keystore_backend_binder.cpp
index 590f005f..9a7c63ef 100644
--- a/keystore-engine/keystore_backend_binder.cpp
+++ b/keystore-engine/keystore_backend_binder.cpp
@@ -114,14 +114,14 @@ int32_t KeystoreBackendBinder::sign(const char* key_id, const uint8_t* in, size_
LOG(ERROR) << AT << "communication error while calling keystore";
return -1;
}
- if (KSReturn(error_code).isOk()) {
+ if (!KSReturn(error_code).isOk()) {
LOG(ERROR) << AT << "getKeyCharacteristics failed: " << error_code;
return -1;
}
auto [km_response, characteristics] = kc_future.get();
- if (KSReturn(km_response.response_code()).isOk()) {
+ if (!KSReturn(km_response.response_code()).isOk()) {
LOG(ERROR) << AT << "getKeyCharacteristics failed: " << km_response.response_code();
return -1;
}