summaryrefslogtreecommitdiffstats
path: root/core/java/android/security/keymaster
Commit message (Expand)AuthorAgeFilesLines
* Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.Alex Klyubin2015-07-161-0/+6
* Merge "Use standard copyright banner in android/security/keymaster." into mnc...Alex Klyubin2015-06-2517-49/+49
|\
| * Use standard copyright banner in android/security/keymaster.Alex Klyubin2015-06-2417-49/+49
* | Track rename of INT and LONG Keymaster tag types.Alex Klyubin2015-06-245-28/+28
|/
* Keymaster INT, LONG and DATE tag values are unsigned.Alex Klyubin2015-06-233-133/+305
* Keymaster key validity dates are optional.Alex Klyubin2015-06-231-0/+6
* Add new error codes for rate-limit and max-use failures.Shawn Willden2015-06-191-1/+2
* Reflect removal of KM_TAG_AEAD_TAG from keymaster.Alex Klyubin2015-06-181-2/+2
* Expose AES GCM backed by Android Keystore.Alex Klyubin2015-06-172-1/+13
* Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-devAlex Klyubin2015-06-031-5/+3
|\
| * Fix block mode numbering (CTR got added as 4 rather than 3)Alex Klyubin2015-06-031-5/+3
* | Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-devAlex Klyubin2015-06-031-4/+3
|\ \
| * | Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAGAlex Klyubin2015-06-021-4/+3
| |/
* | Track changes to the keystore binder APIChad Brubaker2015-06-011-0/+3
|/
* Handle KM_ERROR_CALLER_NONCE_PROHIBITED.Alex Klyubin2015-04-301-0/+2
* Add missing error codes from keymaster_defs.h.Shawn Willden2015-04-291-0/+3
* Add KeyPermanentlyInvalidatedException.Alex Klyubin2015-04-291-0/+22
* Align AndroidKeyStore API with user auth API.Alex Klyubin2015-04-281-4/+4
* am 1ba95855: am a9d74000: am e5e49a17: Merge "Support KM_LONG_REP"Chad Brubaker2015-04-163-2/+28
|\
| * Merge "Support KM_LONG_REP"Chad Brubaker2015-04-163-2/+28
| |\
| | * Support KM_LONG_REPChad Brubaker2015-04-163-2/+28
* | | am b1aa7d0b: am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN...Alex Klyubin2015-04-161-2/+2
|\ \ \ | |/ /
| * | Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
| |\ \
| | * | Add Keymaster KM_ORIGIN_UNKNOWN constant.Alex Klyubin2015-04-141-2/+2
| | |/
* | | am f39aa3d0: am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error ...Alex Klyubin2015-04-161-0/+4
|\ \ \ | |/ /
| * | Add IV-related Keymaster error codes.Alex Klyubin2015-04-151-0/+4
| |/
* | resolved conflicts for merge of a978a3d6 to masterAlex Klyubin2015-04-132-0/+64
|\ \ | |/
| * Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-132-0/+62
| |\
| | * Use JCA names for block modes, paddings, and digests.Alex Klyubin2015-04-132-0/+62
* | | am c88e1396: am 99f4ac14: am 97fce66f: Merge "Make several key crypto paramet...Shawn Willden2015-04-101-6/+6
|\ \ \ | |/ /
| * | Make several key crypto parameters repeatableChad Brubaker2015-04-101-6/+6
| |/
* | am d31d4771: am c5f9683c: am a270264c: Merge "Track more changes to keymaster...Alex Klyubin2015-04-101-18/+1
|\ \ | |/
| * Track more changes to keymaster_defs.hAlex Klyubin2015-04-101-18/+1
* | am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h c...Alex Klyubin2015-04-101-19/+1
|\ \ | |/
| * Track recent keymaster_defs.h changes.Alex Klyubin2015-04-091-19/+1
* | resolved conflicts for merge of 06adabdb to masterAlex Klyubin2015-04-071-0/+4
|\ \ | |/
| * Make the new AndroidKeyStore API conformant.Alex Klyubin2015-04-071-0/+3
* | am 36865896: am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUP...Alex Klyubin2015-04-011-3/+4
|\ \ | |/
| * UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTHAlex Klyubin2015-03-311-3/+4
* | am 543189eb: am 826d6357: am 5491ea9e: Merge "Include operation handle in Ope...Chad Brubaker2015-03-311-0/+3
|\ \ | |/
| * Merge "Include operation handle in OperationResult"Chad Brubaker2015-03-311-0/+3
| |\
| | * Include operation handle in OperationResultChad Brubaker2015-03-201-0/+3
* | | am 23c2b8e8: am d7e06104: am 36ee836d: Merge "Symmetric key generation for An...Alex Klyubin2015-03-271-0/+49
|\ \ \ | |/ /
| * | Symmetric key generation for AndroidKeyStore.Alex Klyubin2015-03-271-0/+49
* | | am 6558d4e7: am ee468ea8: am 6326f964: Merge "Make application/client id an o...Chad Brubaker2015-03-252-0/+75
|\ \ \ | |/ /
| * | Merge "Make application/client id an object"Chad Brubaker2015-03-252-0/+75
| |\ \
| | * | Make application/client id an objectChad Brubaker2015-03-212-0/+75
| | |/
* | | am c217adaf: am 9db6e4d7: am 5aeb0853: Merge "Enforce tag types in KeymasterA...Chad Brubaker2015-03-255-0/+34
|\ \ \ | |/ /
| * | Enforce tag types in KeymasterArgument classesChad Brubaker2015-03-225-0/+34
| |/
* | am 1bed39a5: am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AU...Shawn Willden2015-03-191-1/+1
|\ \ | |/