summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
Commit message (Expand)AuthorAgeFilesLines
* 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
* Document that WebView doesn't honor "uses cleartext traffic" flag.Alex Klyubin2015-04-211-3/+5
* 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
* | | Merge "Document usesCleartextTraffic app-level attribute."Alex Klyubin2015-04-161-3/+3
|\ \ \
| * | | Document usesCleartextTraffic app-level attribute.Alex Klyubin2015-04-151-3/+3
* | | | 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 7081a168: am 5341d83c: am f603e286: Merge "Add authorization binder methods"Chad Brubaker2015-03-301-0/+2
|\ \ \ | |/ /
| * | Merge "Add authorization binder methods"Chad Brubaker2015-03-301-0/+2
| |\ \
| | * | Add authorization binder methodsChad Brubaker2015-03-171-0/+2
* | | | 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 db22c659: am 3e89fac5: am dbd9a4b6: Merge "Allow entropy to be provided to...Chad Brubaker2015-03-271-3/+3
|\ \ \ \ | |/ / /
| * | | Allow entropy to be provided to some operationsChad Brubaker2015-03-271-3/+3
* | | | Unhide public API about cleartext traffic policy.Alex Klyubin2015-03-261-5/+3
* | | | am 6558d4e7: am ee468ea8: am 6326f964: Merge "Make application/client id an o...Chad Brubaker2015-03-253-3/+80
|\ \ \ \ | |/ / /
| * | | Merge "Make application/client id an object"Chad Brubaker2015-03-253-3/+80
| |\ \ \
| | * | | Make application/client id an objectChad Brubaker2015-03-213-3/+80
| | | |/ | | |/|
* | | | am 2faa736e: am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPol...Alex Klyubin2015-03-251-4/+2
|\ \ \ \ | |/ / /
| * | | Merge "Framework's NetworkSecurityPolicy delegates to libcore's one."Alex Klyubin2015-03-251-4/+2
| |\ \ \
| | * | | Framework's NetworkSecurityPolicy delegates to libcore's one.Alex Klyubin2015-03-251-4/+2
* | | | | am c217adaf: am 9db6e4d7: am 5aeb0853: Merge "Enforce tag types in KeymasterA...Chad Brubaker2015-03-255-0/+34
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Enforce tag types in KeymasterArgument classes"Chad Brubaker2015-03-255-0/+34
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Enforce tag types in KeymasterArgument classesChad Brubaker2015-03-225-0/+34
| | |/ /
* | | | am 98ff619d: am d4a2e7c4: am ff022cb1: Merge "Address pending comments for Ne...Alex Klyubin2015-03-251-33/+46
|\ \ \ \ | |/ / /
| * | | Address pending comments for NetworkSecurityPolicy.Alex Klyubin2015-03-241-33/+46
| |/ /
* | | am 2110a28a: am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."Alex Klyubin2015-03-221-0/+66
|\ \ \ | |/ /