diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-03-25 21:08:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 21:08:43 +0000 |
| commit | 7eb1c210510919ee692966ba38d303a4ea5d696e (patch) | |
| tree | d4785c4b2a1854d559382021ceadc17eb2bee4de /keystore | |
| parent | b09f1083e1e934a62d0d134718728be88f0b32a1 (diff) | |
| parent | b8d872fbde849150083836f0d5be3f6fe1c03fb9 (diff) | |
| download | frameworks_base-7eb1c210510919ee692966ba38d303a4ea5d696e.zip frameworks_base-7eb1c210510919ee692966ba38d303a4ea5d696e.tar.gz frameworks_base-7eb1c210510919ee692966ba38d303a4ea5d696e.tar.bz2 | |
am b8d872fb: am 5a01999e: am 704aa5ae: Merge "Use correct tag type for RSA exponent"
* commit 'b8d872fbde849150083836f0d5be3f6fe1c03fb9':
Use correct tag type for RSA exponent
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/tests/src/android/security/KeyStoreTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index cb77455..f755bb0 100644 --- a/keystore/tests/src/android/security/KeyStoreTest.java +++ b/keystore/tests/src/android/security/KeyStoreTest.java @@ -713,8 +713,8 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { args.addInt(KeymasterDefs.KM_TAG_ALGORITHM, KeymasterDefs.KM_ALGORITHM_RSA); args.addInt(KeymasterDefs.KM_TAG_PADDING, KeymasterDefs.KM_PAD_NONE); args.addInt(KeymasterDefs.KM_TAG_KEY_SIZE, 2048); - args.addBlob(KeymasterDefs.KM_TAG_RSA_PUBLIC_EXPONENT, - RSAKeyGenParameterSpec.F4.toByteArray()); + args.addLong(KeymasterDefs.KM_TAG_RSA_PUBLIC_EXPONENT, + RSAKeyGenParameterSpec.F4.longValue()); KeyCharacteristics outCharacteristics = new KeyCharacteristics(); int result = mKeyStore.generateKey(name, args, 0, outCharacteristics); @@ -752,8 +752,8 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { args.addInt(KeymasterDefs.KM_TAG_KEY_SIZE, 2048); args.addInt(KeymasterDefs.KM_TAG_BLOCK_MODE, KeymasterDefs.KM_MODE_ECB); args.addBlob(KeymasterDefs.KM_TAG_APPLICATION_ID, id); - args.addBlob(KeymasterDefs.KM_TAG_RSA_PUBLIC_EXPONENT, - RSAKeyGenParameterSpec.F4.toByteArray()); + args.addLong(KeymasterDefs.KM_TAG_RSA_PUBLIC_EXPONENT, + RSAKeyGenParameterSpec.F4.longValue()); KeyCharacteristics outCharacteristics = new KeyCharacteristics(); int result = mKeyStore.generateKey(name, args, 0, outCharacteristics); |