diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-05-07 11:31:32 -0700 |
|---|---|---|
| committer | Chad Brubaker <cbrubaker@google.com> | 2015-05-15 11:27:23 -0700 |
| commit | 7a882b5d8d64daaad9377ac7cb5c606aac8c4072 (patch) | |
| tree | 13b394806ac4cadc35c4d376fdddae9656d1f8ad /keystore | |
| parent | 6a5f85080e1a3656fc9a4a22c71cf7bc1f9239de (diff) | |
| download | frameworks_base-7a882b5d8d64daaad9377ac7cb5c606aac8c4072.zip frameworks_base-7a882b5d8d64daaad9377ac7cb5c606aac8c4072.tar.gz frameworks_base-7a882b5d8d64daaad9377ac7cb5c606aac8c4072.tar.bz2 | |
Fix testAuthNeeded test
begin now returns OP_AUTH_REQUIRED for per operations with per op
authorization instead of NO_ERROR.
(cherry-picked from commit b0addbaaf22b14200db602c41a5bd86847bdc0a9)
Change-Id: I1f472125f46155833e03ab30bf18363ff51b2c58
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/tests/src/android/security/KeyStoreTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index 7421120..c68b42b 100644 --- a/keystore/tests/src/android/security/KeyStoreTest.java +++ b/keystore/tests/src/android/security/KeyStoreTest.java @@ -953,7 +953,8 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { assertEquals("Generate should succeed", KeyStore.NO_ERROR, rc); OperationResult result = mKeyStore.begin(name, KeymasterDefs.KM_PURPOSE_ENCRYPT, true, args, null, out); - assertEquals("Begin should succeed", KeyStore.NO_ERROR, result.resultCode); + assertEquals("Begin should expect authorization", KeyStore.OP_AUTH_NEEDED, + result.resultCode); IBinder token = result.token; result = mKeyStore.update(token, null, new byte[] {0x01, 0x02, 0x03, 0x04}); assertEquals("Update should require authorization", |