diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-01 13:06:45 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-06-02 14:38:35 -0700 |
| commit | 0fe70813e03891a2fe0efdc16cd289d646205682 (patch) | |
| tree | 77ef12fcbe96baed1d628785ffff9a10f8ddbdd2 /keystore/tests | |
| parent | 3aa33b3da04774d76e1a65b749667450dc81532b (diff) | |
| download | frameworks_base-0fe70813e03891a2fe0efdc16cd289d646205682.zip frameworks_base-0fe70813e03891a2fe0efdc16cd289d646205682.tar.gz frameworks_base-0fe70813e03891a2fe0efdc16cd289d646205682.tar.bz2 | |
Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
Diffstat (limited to 'keystore/tests')
| -rw-r--r-- | keystore/tests/src/android/security/KeyStoreTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index c68b42b..8259f9b 100644 --- a/keystore/tests/src/android/security/KeyStoreTest.java +++ b/keystore/tests/src/android/security/KeyStoreTest.java @@ -806,8 +806,6 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { args.addInt(KeymasterDefs.KM_TAG_PADDING, KeymasterDefs.KM_PAD_NONE); args.addInt(KeymasterDefs.KM_TAG_KEY_SIZE, 256); args.addInt(KeymasterDefs.KM_TAG_BLOCK_MODE, KeymasterDefs.KM_MODE_GCM); - args.addInt(KeymasterDefs.KM_TAG_CHUNK_LENGTH, 4096); - args.addInt(KeymasterDefs.KM_TAG_MAC_LENGTH, 16); args.addBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED); KeyCharacteristics outCharacteristics = new KeyCharacteristics(); @@ -819,6 +817,7 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { args.addInt(KeymasterDefs.KM_TAG_ALGORITHM, KeymasterDefs.KM_ALGORITHM_AES); args.addInt(KeymasterDefs.KM_TAG_BLOCK_MODE, KeymasterDefs.KM_MODE_GCM); args.addInt(KeymasterDefs.KM_TAG_PADDING, KeymasterDefs.KM_PAD_NONE); + args.addInt(KeymasterDefs.KM_TAG_MAC_LENGTH, 128); OperationResult result = mKeyStore.begin(name, KeymasterDefs.KM_PURPOSE_ENCRYPT, true, args, null, out); IBinder token = result.token; @@ -827,6 +826,7 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { assertEquals("Update should succeed", KeyStore.NO_ERROR, result.resultCode); assertEquals("Finish should succeed", KeyStore.NO_ERROR, mKeyStore.finish(token, null, null).resultCode); + // TODO: Assert that an AEAD tag was returned by finish } public void testBadToken() throws Exception { |