diff options
| author | Xin Li <delphij@google.com> | 2019-10-25 10:27:57 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-10-25 10:27:57 -0700 |
| commit | e848dcb1a6957d157e6f01be3354b39a9a6c1161 (patch) | |
| tree | 993884265ae1cbb80d89e3dffeaf42c3f0e52133 | |
| parent | d83e225d40bd38b1cb3e0eb1bf984e8d23b89278 (diff) | |
| parent | df296abaa1ed8a3e5ead1449ec02177343718b88 (diff) | |
| download | android-e848dcb1a6957d157e6f01be3354b39a9a6c1161.tar.gz | |
Bug: 141248619
Change-Id: I4537506e4671845215e1e1bc0e98ca8d8764ccd6
Merged-In: If09e45cb0814c0253b632e76b5ad6baaf03679d4
| -rw-r--r-- | hals/keymaster/KeymasterDevice.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hals/keymaster/KeymasterDevice.cpp b/hals/keymaster/KeymasterDevice.cpp index 61614e9..c312262 100644 --- a/hals/keymaster/KeymasterDevice.cpp +++ b/hals/keymaster/KeymasterDevice.cpp @@ -346,6 +346,7 @@ Return<void> KeymasterDevice::getHmacSharingParameters( if (ec != ErrorCode::OK) { _hidl_cb(ec, HmacSharingParameters()); + return Void(); } const std::string & nonce = response.hmac_sharing_params().nonce(); @@ -717,6 +718,7 @@ Return<void> KeymasterDevice::attestKey( ::strftime(not_after_str, sizeof(not_after_str), "%y%m%d%H%M%SZ", gmtime(¬_after)) == 0) { _hidl_cb(ErrorCode::UNKNOWN_ERROR, hidl_vec<hidl_vec<uint8_t> >{}); + return Void(); } startRequest.mutable_blob()->set_blob(&keyToAttest[0], keyToAttest.size()); |