summaryrefslogtreecommitdiffstats
path: root/keystore
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of e7e705d4 to masterAlex Klyubin2015-04-023-17/+458
|\
| * Merge "Expose new key use constraints in KeyPairGeneratorSpec."Alex Klyubin2015-04-023-17/+458
| |\
| | * Expose new key use constraints in KeyPairGeneratorSpec.Alex Klyubin2015-04-023-17/+458
* | | am a44e7fd6: am 957e982c: am d2eec1a7: Merge "Add exception types for Android...Alex Klyubin2015-04-024-0/+115
|\ \ \ | |/ /
| * | Add exception types for AndroidKeyStore key validity issues.Alex Klyubin2015-04-014-0/+115
| |/
* | Add fingerprint-specific AndroidKeyStore API.Alex Klyubin2015-04-019-6/+153
* | am 66b96b59: am 78014a78: am 04047af6: Merge "Use Keymaster-friendly validity...Alex Klyubin2015-04-023-27/+41
|\ \ | |/
| * Use Keymaster-friendly validity dates.Alex Klyubin2015-04-013-27/+41
* | am 838f054f: am a4ea4726: am c461452e: Merge "Hook in user authenticators and...Alex Klyubin2015-04-019-30/+159
|\ \ | |/
| * Merge "Hook in user authenticators and their exceptions."Alex Klyubin2015-04-019-30/+159
| |\
| | * Hook in user authenticators and their exceptions.Alex Klyubin2015-03-319-30/+159
* | | am 93e029e0: am f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operat...Alex Klyubin2015-04-014-3/+103
|\ \ \ | |/ /
| * | A way to obtain KeyStore operation handle from crypto primitives.Alex Klyubin2015-03-314-3/+103
| |/
* | am f0c71ceb: am 01e53ef1: am b7a34e49: Merge "Add license banner to recently ...Alex Klyubin2015-04-0114-0/+224
|\ \ | |/
| * Add license banner to recently added AndroidKeyStore files.Alex Klyubin2015-03-3114-0/+224
* | am c230e190: am 9c0f257f: am 19e79e12: Merge "Add SecretKeyFactory backed by ...Alex Klyubin2015-04-016-1/+445
|\ \ | |/
| * Add SecretKeyFactory backed by AndroidKeyStore.Alex Klyubin2015-03-316-1/+445
* | am d684ebd3: am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers...Alex Klyubin2015-03-317-111/+758
|\ \ | |/
| * Add unauthenticated AES ciphers backed by AndroidKeyStore.Alex Klyubin2015-03-317-111/+758
* | am 7ca65f09: am b000d129: am 6a6f0c7d: Merge "Add HmacSHA256 backed by Androi...Alex Klyubin2015-03-309-4/+472
|\ \ | |/
| * Merge "Add HmacSHA256 backed by AndroidKeyStore."Alex Klyubin2015-03-309-4/+472
| |\
| | * Add HmacSHA256 backed by AndroidKeyStore.Alex Klyubin2015-03-309-4/+472
* | | am 7081a168: am 5341d83c: am f603e286: Merge "Add authorization binder methods"Chad Brubaker2015-03-301-0/+30
|\ \ \ | |/ /
| * | Merge "Add authorization binder methods"Chad Brubaker2015-03-301-0/+30
| |\ \ | | |/ | |/|
| | * Add authorization binder methodsChad Brubaker2015-03-171-0/+30
* | | am 23c2b8e8: am d7e06104: am 36ee836d: Merge "Symmetric key generation for An...Alex Klyubin2015-03-277-0/+765
|\ \ \ | |/ /
| * | Symmetric key generation for AndroidKeyStore.Alex Klyubin2015-03-277-0/+765
* | | am db22c659: am 3e89fac5: am dbd9a4b6: Merge "Allow entropy to be provided to...Chad Brubaker2015-03-272-15/+34
|\ \ \ | |/ /
| * | Allow entropy to be provided to some operationsChad Brubaker2015-03-272-15/+34
* | | am 8e7df37c: am d880dc2f: am 274a4ee3: Merge "Symmetric key import for Androi...Alex Klyubin2015-03-277-21/+1136
|\ \ \ | |/ /
| * | Merge "Symmetric key import for AndroidKeyStore."Alex Klyubin2015-03-277-21/+1136
| |\ \
| | * | Symmetric key import for AndroidKeyStore.Alex Klyubin2015-03-267-21/+1136
* | | | am b8d872fb: am 5a01999e: am 704aa5ae: Merge "Use correct tag type for RSA ex...Chad Brubaker2015-03-251-4/+4
|\ \ \ \ | |/ / /
| * | | Use correct tag type for RSA exponentChad Brubaker2015-03-221-4/+4
| |/ /
* | | am 6558d4e7: am ee468ea8: am 6326f964: Merge "Make application/client id an o...Chad Brubaker2015-03-252-15/+8
|\ \ \ | |/ /
| * | Make application/client id an objectChad Brubaker2015-03-212-15/+8
* | | am 6050eb54: am 5b11b3d6: am 31cee318: Merge "Specify public exponent for RSA"Chad Brubaker2015-03-231-0/+5
|\ \ \ | |/ /
| * | Specify public exponent for RSAChad Brubaker2015-03-201-0/+5
| |/
* | am 99e9acd9: am f1654c60: Merge "Add initial Keymaster 1.0 tests"Chad Brubaker2015-03-131-0/+218
|\ \ | |/
| * Add initial Keymaster 1.0 testsChad Brubaker2015-03-061-0/+218
* | am f271fa33: am cdc70256: am f3c117ca: Merge "Add new IKeystoreService method...Chad Brubaker2015-02-241-0/+111
|\ \ | |/
| * Add new IKeystoreService methods to KeyStoreChad Brubaker2015-02-231-0/+111
* | Device Policy API to choose a private key silentlyRobin Lee2015-02-051-1/+55
|/
* Merge "Remove DSA support from Android KeyStore and KeyChain."Alex Klyubin2015-01-164-601/+9
|\
| * Remove DSA support from Android KeyStore and KeyChain.Alex Klyubin2015-01-144-601/+9
* | Merge "Add KeyPairGenerator.EC backed by Android KeyStore."Alex Klyubin2015-01-164-90/+140
|\ \ | |/ |/|
| * Add KeyPairGenerator.EC backed by Android KeyStore.Alex Klyubin2015-01-144-90/+140
* | Generate IKeystoreService using aidlChad Brubaker2015-01-131-1/+2
|/
* Track change to ConscryptKenny Root2014-11-264-34/+4
* Correct test data size in keystore signing and verification tests.Shawn Willden2014-09-141-15/+16