commit c4b0565e83a7841d23b18944ade6faffbe9f28b7
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 30 12:45:11 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 30 12:45:11 2018 +0000
tree a89714ab3ad1a7db6cc43d6cc072850fbf26a1c1
parent b479003e6f1b9cbcc2ea9290f4388135236b2d0b
parent ec71e7b92d97149abeccf848a0be86036834f58c

Merge "Fix status code returned by KeyStoreService::sign function." into pi-dev

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 3e8783b..620e972 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -550,8 +550,11 @@
     hidl_vec<uint8_t> legacy_out;
     KeyStoreServiceReturnCode res =
         doLegacySignVerify(name, data, &legacy_out, hidl_vec<uint8_t>(), KeyPurpose::SIGN);
+    if (!res.isOk()) {
+        return Status::fromServiceSpecificError((res));
+    }
     *out = legacy_out;
-    return Status::fromServiceSpecificError((res));
+    return Status::ok();
 }
 
 Status KeyStoreService::verify(const String16& name, const ::std::vector<uint8_t>& data,