summaryrefslogtreecommitdiffstats
path: root/keystore
Commit message (Expand)AuthorAgeFilesLines
* Handle KM_ERROR_CALLER_NONCE_PROHIBITED.Alex Klyubin2015-04-301-0/+2
* Merge "Switch from FingerprintService to FingerprintManager." into mnc-devAlex Klyubin2015-04-301-26/+24
|\
| * Switch from FingerprintService to FingerprintManager.Alex Klyubin2015-04-301-26/+24
* | Merge "Cleanup logic for per-op auth keys." into mnc-devAlex Klyubin2015-04-305-65/+173
|\ \ | |/ |/|
| * Cleanup logic for per-op auth keys.Alex Klyubin2015-04-305-65/+173
* | Merge "Fix the build" into mnc-devSvetoslav2015-04-301-2/+17
|\ \
| * | Fix the buildSvetoslav2015-04-301-2/+17
| |/
* | Track Keymaster changes.Alex Klyubin2015-04-304-30/+15
|/
* Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc...Alex Klyubin2015-04-302-31/+113
|\
| * AndroidKeyStore keys should not be handled by Bouncy Castle.Alex Klyubin2015-04-292-31/+113
* | Surface KeyPermanentlyInvalidatedException for per-op auth keys.Alex Klyubin2015-04-292-0/+20
* | Enable per-use user authenticated keys to be used.Alex Klyubin2015-04-293-2/+12
* | Add KeyPermanentlyInvalidatedException.Alex Klyubin2015-04-298-73/+130
|/
* Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-devChad Brubaker2015-04-291-0/+8
|\
| * Add OP_AUTH_NEEDED KeyStore result codeChad Brubaker2015-04-281-0/+8
* | Align AndroidKeyStore API with user auth API.Alex Klyubin2015-04-289-362/+216
|/
* am 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to usin...Kenny Root2015-04-244-34/+34
|\
| * Merge "frameworks/base: switch to using NativeConstants."Kenny Root2015-04-244-34/+34
| |\
| | * frameworks/base: switch to using NativeConstants.Adam Langley2015-04-244-34/+34
* | | resolved conflicts for merge of f9c14b7d to masterAlex Klyubin2015-04-2411-94/+105
|\ \ \ | |/ /
| * | No runtime exceptions during normal use of AndroidKeyStore crypto.Alex Klyubin2015-04-2410-95/+102
* | | am edf5454a: am 3167fb4b: am 71223ebe: Merge "Reset AndroidKeyStore Mac and C...Alex Klyubin2015-04-242-22/+79
|\ \ \ | |/ /
| * | Reset AndroidKeyStore Mac and Cipher state when init fails.Alex Klyubin2015-04-242-22/+79
| |/
* | Merge "Set Secure User ID from app level."Alex Klyubin2015-04-163-0/+42
|\ \
| * | Set Secure User ID from app level.Alex Klyubin2015-04-163-0/+42
* | | Unhide KeyStoreKeyProperties.Origin.UNKNOWN.Alex Klyubin2015-04-161-3/+1
|/ /
* | am b1aa7d0b: am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN...Alex Klyubin2015-04-161-1/+11
|\ \ | |/
| * Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-1/+11
| |\
| | * Add Keymaster KM_ORIGIN_UNKNOWN constant.Alex Klyubin2015-04-141-1/+11
* | | am 22b5d9b9: am 28a9089f: am 216d18b9: Merge "Remove IV auto-generation worka...Alex Klyubin2015-04-161-12/+6
|\ \ \ | |/ /
| * | Remove IV auto-generation workaround.Alex Klyubin2015-04-151-12/+6
* | | 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
| |/