summaryrefslogtreecommitdiffstats
path: root/keystore/java
Commit message (Expand)AuthorAgeFilesLines
* 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-271-7/+7
|\ \ \ | |/ /
| * | Allow entropy to be provided to some operationsChad Brubaker2015-03-271-7/+7
* | | am 8e7df37c: am d880dc2f: am 274a4ee3: Merge "Symmetric key import for Androi...Alex Klyubin2015-03-276-20/+1135
|\ \ \ | |/ /
| * | Symmetric key import for AndroidKeyStore.Alex Klyubin2015-03-266-20/+1135
* | | am 6558d4e7: am ee468ea8: am 6326f964: Merge "Make application/client id an o...Chad Brubaker2015-03-251-2/+4
|\ \ \ | |/ /
| * | Make application/client id an objectChad Brubaker2015-03-211-2/+4
| |/
* | 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-162-9/+7
|\
| * Remove DSA support from Android KeyStore and KeyChain.Alex Klyubin2015-01-142-9/+7
* | 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
* Add DevicePolicyManager PrivateKey mgmtBernhard Bauer2014-09-111-0/+3
* Extend IKeyChainService AIDL with CACert retrievalZoltan Szatmary-Ban2014-09-082-1/+9
* Keep managed profile keystores in sync with ownerRobin Lee2014-08-291-0/+30
* Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in ...Zoltan Szatmary-Ban2014-08-152-9/+1
* Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings...Zoltan Szatmary-Ban2014-08-152-1/+9
* Revert "Revert "Revert "Update Trusted Credentials screen in settings"""Narayan Kamath2014-08-152-9/+1
* Revert "Revert "Update Trusted Credentials screen in settings""Zoltan Szatmary-Ban2014-08-152-1/+9
* Revert "Update Trusted Credentials screen in settings"Zoltan Szatmary-Ban2014-08-072-9/+1
* Update Trusted Credentials screen in settingsZoltan Szatmary-Ban2014-07-292-1/+9
* Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs"""Robin Lee2014-06-171-3/+14
|\
| * Revert "Revert "Publish DevicePolicyManager CA certificate APIs""Robin Lee2014-06-191-3/+14
* | Merge "Revert "Publish DevicePolicyManager CA certificate APIs""Robin Lee2014-06-171-14/+3
|\ \ | |/
| * Revert "Publish DevicePolicyManager CA certificate APIs"Robin Lee2014-06-171-14/+3
* | Merge "Publish DevicePolicyManager CA certificate APIs"Robin Lee2014-06-171-3/+14
|\ \ | |/
| * Publish DevicePolicyManager CA certificate APIsRobin Lee2014-06-111-3/+14
* | am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2:...Robert Ly2014-06-112-4/+4
|\ \ | |/ |/|
| * am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStoreRobert Ly2014-06-102-4/+4
| |\
| | * am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStoreRobert Ly2014-06-102-4/+4
| | |\
| | | * Add documentation for AndroidKeyStoreRobert Ly2014-05-072-4/+4
* | | | Use the correct package name for CHOOSERKenny Root2014-03-171-1/+6
* | | | KeyChain: add explicit package for getPrivateKeyKenny Root2014-02-071-1/+7
* | | | Remove unused imports from frameworks/base.John Spurlock2013-11-205-11/+0
|/ / /
* | | Add argument to binder call to check key typesKenny Root2013-09-052-3/+12
* | | Unhide functions to allow ECDSA supportKenny Root2013-09-031-6/+0
* | | Add support for DSA and ECDSA key typesKenny Root2013-09-033-15/+243
* | | Add methods for managing CAs to DevicePolicyManager(Service)Maggie Benthall2013-08-201-1/+4
|/ /
* | resolved conflicts for merge of fca0f92e to stage-aosp-masterElliott Hughes2013-06-281-3/+3
|\ \