| commit | 7cf3ac8330bb31b712e4efd1894182127ec8e84f | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Mon Apr 17 17:50:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 17 17:50:00 2017 +0000 |
| tree | 422363e86dd26b4c997bbdfe7833a2544480f9e1 | |
| parent | 788e50a6e55f397784b166fcb44fa6a4c6c06508 [diff] | |
| parent | 45c112a5664660ba303aedf89de3f7fa2a2e43be [diff] |
Decrypt super-encrypted keys am: 45c112a566 Change-Id: I4176854a98ab0175c9e25ac27cb039c26865050a
diff --git a/keystore/blob.cpp b/keystore/blob.cpp index 0e09262..e173b68 100644 --- a/keystore/blob.cpp +++ b/keystore/blob.cpp
@@ -191,7 +191,7 @@ } ssize_t digestedLength; - if (isEncrypted()) { + if (isEncrypted() || isSuperEncrypted()) { if (encryptedLength % AES_BLOCK_SIZE != 0) { return ResponseCode::VALUE_CORRUPTED; }