aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-07-09 11:23:59 -0700
committerXin Li <delphij@google.com>2019-07-09 11:23:59 -0700
commitb207d11fc3874cb921b6175375a82857815a6ede (patch)
tree77482efd1319f313774b4027c0615fd1736eb037
parenta1f29a7689f2adbcfb6e3c02d5fde5e7da67b89a (diff)
parent36f5d61b6419bef896b22e40b403b080209caeb6 (diff)
downloadandroid-b207d11fc3874cb921b6175375a82857815a6ede.tar.gz
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576 Change-Id: Ie77e642f3d61ab17d23c02126166047b4da88da0
-rw-r--r--hals/keymaster/KeymasterDevice.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/hals/keymaster/KeymasterDevice.cpp b/hals/keymaster/KeymasterDevice.cpp
index cb3d6ff..61614e9 100644
--- a/hals/keymaster/KeymasterDevice.cpp
+++ b/hals/keymaster/KeymasterDevice.cpp
@@ -807,13 +807,13 @@ Return<void> KeymasterDevice::attestKey(
}
vector<hidl_vec<uint8_t> > chain;
+ string attestation_str = ss.str();
{
hidl_vec<uint8_t> attestation_certificate;
attestation_certificate.setToExternal(
- reinterpret_cast<uint8_t*>(
- const_cast<char*>(ss.str().data())),
- ss.str().size(), false);
-
+ reinterpret_cast<uint8_t*>(
+ const_cast<char*>(attestation_str.data())),
+ attestation_str.size(), false);
chain.push_back(std::move(attestation_certificate));