summaryrefslogtreecommitdiffstats
path: root/keystore
Commit message (Expand)AuthorAgeFilesLines
* am 763100e6: am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric key...Shawn Willden2015-04-151-5/+10
|\
| * Unbreak obtaining symmetric keys from AndroidKeyStore.Alex Klyubin2015-04-141-5/+10
* | resolved conflicts for merge of 1d5a2592 to masterAlex Klyubin2015-04-141-29/+2
|\ \ | |/
| * Merge "No need to specify EC curve name in EcIesParameterSpec."Alex Klyubin2015-04-141-25/+2
| |\
| | * No need to specify EC curve name in EcIesParameterSpec.Alex Klyubin2015-04-131-25/+2
* | | am fa2bd4fe: am 888f5cb7: am ecfda064: Merge "Make specifying self-signed cer...Alex Klyubin2015-04-142-40/+64
|\ \ \ | |/ /
| * | Make specifying self-signed cert parameters optional.Alex Klyubin2015-04-142-40/+64
| |/
* | Unhide the new AndroidKeyStore API.Alex Klyubin2015-04-1312-129/+10
* | resolved conflicts for merge of a978a3d6 to masterAlex Klyubin2015-04-1315-1456/+1099
|\ \ | |/
| * Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-1315-1446/+1089
| |\
| | * Use JCA names for block modes, paddings, and digests.Alex Klyubin2015-04-1315-1446/+1089
* | | am 651dbfde: am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enabl...Alex Klyubin2015-04-111-0/+287
|\ \ \ | |/ /
| * | Merge "Add EcIesParameterSpec to enable ECIES crypto."Alex Klyubin2015-04-111-0/+287
| |\ \
| | * | Add EcIesParameterSpec to enable ECIES crypto.Alex Klyubin2015-04-101-0/+287
* | | | am 93976df8: am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Blueto...Chad Brubaker2015-04-101-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Fix testSaw_ungrantedUid_Bluetooth"Chad Brubaker2015-04-101-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Fix testSaw_ungrantedUid_BluetoothChad Brubaker2015-04-101-2/+2
| | |/
* | | am d31d4771: am c5f9683c: am a270264c: Merge "Track more changes to keymaster...Alex Klyubin2015-04-101-9/+5
|\ \ \ | |/ /
| * | Track more changes to keymaster_defs.hAlex Klyubin2015-04-101-9/+5
| |/
* | am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h c...Alex Klyubin2015-04-101-2/+2
|\ \ | |/
| * Track recent keymaster_defs.h changes.Alex Klyubin2015-04-091-2/+2
* | am 04a99c7b: am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not a...Alex Klyubin2015-04-103-15/+29
|\ \ | |/
| * Split key origin into TEE/not and generated/imported.Alex Klyubin2015-04-093-15/+29
* | am 4acc3392: am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadoc...Alex Klyubin2015-04-093-21/+14
|\ \ | |/
| * Fix minor issues in new Javadocs of AndroidKeyStore.Alex Klyubin2015-04-093-21/+14
* | am 098833c5: am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants...Alex Klyubin2015-04-091-5/+98
|\ \ | |/
| * Merge "Add asymmetric crypto constants for AndroidKeyStore API."Alex Klyubin2015-04-091-5/+98
| |\
| | * Add asymmetric crypto constants for AndroidKeyStore API.Alex Klyubin2015-04-091-5/+98
* | | am c6112eb7: am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA...Alex Klyubin2015-04-092-0/+11
|\ \ \ | |/ /
| * | Merge "Add missing mapping between JCA and keystore HMAC names."Alex Klyubin2015-04-092-0/+11
| |\ \ | | |/ | |/|
| | * Add missing mapping between JCA and keystore HMAC names.Alex Klyubin2015-04-092-0/+11
* | | am bbf3cc57: am fd168151: am e26347bb: Merge "Hide KeyStoreParameter.Builder....Alex Klyubin2015-04-091-1/+2
|\ \ \ | |/ /
| * | Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.Alex Klyubin2015-04-091-1/+2
| |/
* | resolved conflicts for merge of b9a9d46c to masterAlex Klyubin2015-04-096-12/+249
|\ \ | |/
| * Merge "Require IND-CPA by default for new AndroidKeyStore keys."Alex Klyubin2015-04-096-12/+247
| |\
| | * Require IND-CPA by default for new AndroidKeyStore keys.Alex Klyubin2015-04-086-12/+247
* | | am 2d81cb68: am 2cb1e1dc: am 1da3d7fc: Merge "Add more digests to AndroidKeyS...Alex Klyubin2015-04-094-23/+190
|\ \ \ | |/ /
| * | Add more digests to AndroidKeyStore API.Alex Klyubin2015-04-084-23/+190
| |/
* | am da66cab3: am f1a1160c: am c0d6b7cb: Merge "Fix typo"Alex Klyubin2015-04-081-1/+1
|\ \ | |/
| * Fix typoAlex Klyubin2015-04-081-1/+1
* | am 9be1016b: am c48e8cf0: am edd0e6c0: Merge "Refuse to reuse IV in encryptio...Alex Klyubin2015-04-081-14/+44
|\ \ | |/
| * Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore."Alex Klyubin2015-04-081-14/+44
| |\
| | * Refuse to reuse IV in encryption mode in AndroidKeyStore.Alex Klyubin2015-04-081-14/+44
* | | am 8ad875f5: am 0649c832: am 3283d2d2: Merge "Add BlockMode.GCM constant to A...Alex Klyubin2015-04-081-1/+12
|\ \ \ | |/ /
| * | Add BlockMode.GCM constant to AndroidKeyStore API.Alex Klyubin2015-04-071-1/+12
| |/
* | resolved conflicts for merge of 06adabdb to masterAlex Klyubin2015-04-078-700/+471
|\ \ | |/
| * Make the new AndroidKeyStore API conformant.Alex Klyubin2015-04-078-698/+470
* | am ba88b692: am e2e5b88e: am 64b0062a: Merge "Load fewer classes when Android...Alex Klyubin2015-04-031-15/+23
|\ \ | |/
| * Load fewer classes when AndroidKeyStore provider is installed.Alex Klyubin2015-04-031-15/+23
* | resolved conflicts for merge of b068f162 to masterAlex Klyubin2015-04-037-54/+78
|\ \ | |/
generated by cgit v1.1 at 2024-11-01 03:42:20 +0000