summaryrefslogtreecommitdiffstats
path: root/keystore
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Merge "Rename KeymasterException to KeyStoreException."Alex Klyubin2015-04-037-51/+75
| |\
| | * Rename KeymasterException to KeyStoreException.Alex Klyubin2015-04-027-51/+75
* | | am 54d583c1: am e797eb2e: am 377885e1: Merge "Mark all test keys as no auth r...Chad Brubaker2015-04-031-0/+32
|\ \ \ | |/ /
| * | Merge "Mark all test keys as no auth required"Chad Brubaker2015-04-031-0/+32
| |\ \
| | * | Mark all test keys as no auth requiredChad Brubaker2015-04-021-0/+32
* | | | am c869ac1b: am ec029e55: am b292e49b: Merge "Obtain SPI without using Reflec...Alex Klyubin2015-04-031-14/+7
|\ \ \ \ | |/ / /
| * | | Obtain SPI without using Reflection.Alex Klyubin2015-04-031-14/+7
| | |/ | |/|
* | | Add fingerprint-specific API to KeyPairGeneratorSpec.Alex Klyubin2015-04-021-3/+39
* | | am 58031d5e: am 378df98e: am 3cc9e5d6: Merge "Improve the AndroidKeyStore-bac...Alex Klyubin2015-04-022-10/+18
|\ \ \ | |/ /
| * | Merge "Improve the AndroidKeyStore-backed HMAC state machine."Alex Klyubin2015-04-022-10/+18
| |\ \
| | * | Improve the AndroidKeyStore-backed HMAC state machine.Alex Klyubin2015-04-012-10/+18
* | | | 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