tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8635 commits 1 branch 0 tags 12 MiB
Commit graph

8635 commits

This branch
This branch
All branches
Author SHA1 Message Date
The Android Automerger
d05e93db9c merge in master-release history after reset to 1d4d33bc7a 2014-05-13 05:51:15 -07:00
The Android Automerger
beac048a8a merge in master-release history after reset to 1d4d33bc7a 2014-05-12 05:50:20 -07:00
The Android Automerger
78b5fcbece merge in master-release history after reset to 1d4d33bc7a 2014-05-11 05:50:08 -07:00
The Android Automerger
3469d168f1 merge in master-release history after reset to 1d4d33bc7a 2014-05-10 05:51:26 -07:00
The Android Automerger
15100f02aa merge in master-release history after reset to 1d4d33bc7a 2014-05-08 05:51:02 -07:00
Kenny Root
1d4d33bc7a am 3080ea76: am fba667fc: am bb15653d: Merge "Add support for specifying which key types are supported" 
* commit '3080ea76d2c8b823444a1cab9ec0fcd042f7d01c':
  Add support for specifying which key types are supported
 2014-05-07 21:22:00 +00:00
Kenny Root
3080ea76d2 am fba667fc: am bb15653d: Merge "Add support for specifying which key types are supported" 
* commit 'fba667fca3fce012bc5d4703f0e2d4f3ef06cfb6':
  Add support for specifying which key types are supported
 2014-05-07 19:37:18 +00:00
Kenny Root
48c6b885a0 Add support for specifying which key types are supported 
(cherry picked from commit 1d448c074a)

Change-Id: I8ca9e91048c6bc76358f004bbe72b4e013d19203
 2014-05-07 11:47:01 -07:00
Kenny Root
7f67baf8f0 Add support for specifying which key types are supported 
(cherry picked from commit 1d448c074a)

Change-Id: I8ca9e91048c6bc76358f004bbe72b4e013d19203
 2014-05-07 08:54:21 -07:00
Kenny Root
fba667fca3 am bb15653d: Merge "Add support for specifying which key types are supported" 
* commit 'bb15653d4ffdb14082d091a303e946a010154544':
  Add support for specifying which key types are supported
 2014-05-06 22:03:40 +00:00
Kenny Root
bb15653d4f Merge "Add support for specifying which key types are supported" 2014-05-06 21:59:03 +00:00
Kenny Root
1d448c074a Add support for specifying which key types are supported 
Change-Id: Ia5a331868ea3e09891c52bbabc2942554253c458
 2014-05-06 14:24:37 -07:00
Kenny Root
c30aaf8cbf am a7700b73: am 9ffe9be8: Merge "Fix the Vector erase bug" 
* commit 'a7700b7300b4c136c34ecdacfe6bd581357ede88':
 2014-04-30 01:00:11 +00:00
Colin Cross
6d390201cd am b2197930: am afd75728: Merge "keystore: fix errors inside ALOGV" 
* commit 'b2197930d7a734692392a8d8d6a4bfaf146a7f2f':
 2014-04-30 01:00:11 +00:00
Kenny Root
a7700b7300 am 9ffe9be8: Merge "Fix the Vector erase bug" 
* commit '9ffe9be8dd27def3f674da90cf9619437e3d428c':
  Fix the Vector erase bug
 2014-03-11 18:52:18 +00:00
Kenny Root
279e5d5a34 am 9ffe9be8: Merge "Fix the Vector erase bug" 
* commit '9ffe9be8dd27def3f674da90cf9619437e3d428c':
  Fix the Vector erase bug
 2014-03-10 16:04:01 +00:00
Kenny Root
9ffe9be8dd Merge "Fix the Vector erase bug" 2014-03-10 16:00:28 +00:00
Colin Cross
b2197930d7 am afd75728: Merge "keystore: fix errors inside ALOGV" 
* commit 'afd757283285c3859fcf00990b07d8f5a9e3ae02':
  keystore: fix errors inside ALOGV
 2014-03-07 02:25:15 +00:00
Colin Cross
db1b8f1b4d am afd75728: Merge "keystore: fix errors inside ALOGV" 
* commit 'afd757283285c3859fcf00990b07d8f5a9e3ae02':
  keystore: fix errors inside ALOGV
 2014-02-07 21:35:22 +00:00
Colin Cross
afd7572832 Merge "keystore: fix errors inside ALOGV" 2014-02-07 21:27:14 +00:00
Colin Cross
20e90ad94a keystore: fix errors inside ALOGV 
Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I42752d163bebe841d21f5feb8909a9e5017d74d1
 2014-02-06 20:38:48 -08:00
Colin Cross
8f7f96213c am 495a95d4: Merge "system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" 
* commit '495a95d490e5e1a13a69fefb338473ada12495e3':
  system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
 2014-01-28 00:55:37 +00:00
Colin Cross
495a95d490 Merge "system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" 2014-01-28 00:48:18 +00:00
Colin Cross
3d2f4fd026 system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH 
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
 2014-01-24 21:00:32 -08:00
haitao fang
c35d4eb3e6 Fix the Vector erase bug 
In the Vector traversal and delete operation, we can't
move to the next item when we use the erase function.

Change-Id: I9accfb7f109f73dcec900b666077120235bf7ef1
 2014-01-21 12:27:54 +09:00
Brian Carlstrom
b66675149c am e040a571: Merge "Use %zu, %td for size_t, ptrdiff_t, respectively." 
* commit 'e040a5710561686d70d110e3cc1bcafedbeb7ec2':
  Use %zu, %td for size_t, ptrdiff_t, respectively.
 2013-12-11 11:29:55 -08:00
Brian Carlstrom
e040a57105 Merge "Use %zu, %td for size_t, ptrdiff_t, respectively." 2013-12-11 19:23:23 +00:00
Matteo Franchin
6489e02e13 Use %zu, %td for size_t, ptrdiff_t, respectively. 
Changing ALOG format strings to %zu (for one size_t integer) and to
%td (for a couple of pointer differences). These changes are necessary
when compiling for LP64 architectures.

Change-Id: I9bb667500af1b82c360f0fc84e50d70bd46cba6e
Signed-off-by: Matteo Franchin <matteo.franchin@arm.com>
 2013-12-11 16:16:36 +00:00
The Android Open Source Project
12543689fd am d0f35a1a: Merge commit \'049462c2920b2082bde538210b1029da19b15788\' into HEAD 
* commit 'd0f35a1a30c51a26c0a50922736d804f40c2f9aa':
 2013-12-05 17:26:57 -08:00
The Android Open Source Project
d0f35a1a30 Merge commit '049462c2920b2082bde538210b1029da19b15788' into HEAD 2013-12-05 12:38:34 -08:00
The Android Open Source Project
82b6dc9084 am c55921b0: Merge commit \'72f6fde4563f9e5f2aff8211a54342d752aa7029\' into HEAD 
* commit 'c55921b02233fdbc68491e814a01eb2b6996ff6a':
 2013-11-22 19:20:08 -08:00
The Android Open Source Project
c55921b022 Merge commit '72f6fde4563f9e5f2aff8211a54342d752aa7029' into HEAD 2013-11-22 10:36:02 -08:00
Nick Kralevich
049462c292 am 8d01e624: Merge "softkeymaster: do not use GNU old-style field designators" 
* commit '8d01e624d52d1c34de5926b5bc47d265532a9527':
  softkeymaster: do not use GNU old-style field designators
 2013-10-18 19:37:30 -07:00
Nick Kralevich
8d01e624d5 Merge "softkeymaster: do not use GNU old-style field designators" 2013-10-19 02:29:53 +00:00
synergydev
2d73d558d7 softkeymaster: do not use GNU old-style field designators 
Fix the following:
error: use of GNU old-style field designator extension

Change-Id: Id77d4d5cd588774354b23c13f988fc7c55674d8f
 2013-10-18 18:40:15 -07:00
Kenny Root
72f6fde456 resolved conflicts for merge of 1a023f89 to klp-dev-plus-aosp 
Change-Id: I61c3d1ea509adc54b85bb6bb11350b6c466a8608
 2013-10-16 09:09:54 -07:00
Kenny Root
1a023f8953 Merge "Fix some spots where targetUid was missed" 2013-10-16 16:00:56 +00:00
Kenny Root
fa27d5bbc3 Fix some spots where targetUid was missed 
Some of the targetUid arguments weren't used where they should have
been.

Change-Id: Ief5df897440ddfb572feb57026a6057d64c7c09b
 2013-10-15 11:31:51 -07:00
Kenny Root
f90361244b am ee8068b9: Set encrypted flag when appropriate 
* commit 'ee8068b9e7bfb2770635062fc9c2035be2142bd8':
  Set encrypted flag when appropriate
 2013-10-08 16:24:53 -07:00
Kenny Root
ee8068b9e7 Set encrypted flag when appropriate 
"generate" and "put" were not setting the encrypted flag in the blob
written to disk. Add setting the flag whenever appropriate for these
functions.

Additinally, the master key should always be encrypted.

Bug: 11113056
Change-Id: Ibf8f2ad4d5de0732dcc25e1005ad4751683e3b80
 2013-10-07 11:13:15 -07:00
Kenny Root
dc3b74f61e am ace0b422: Merge "Use canonical UniquePtr.h header" 
* commit 'ace0b4229a8ad6682e4439e3853de923c91628dc':
  Use canonical UniquePtr.h header
 2013-09-11 14:56:06 -07:00
Kenny Root
ace0b4229a Merge "Use canonical UniquePtr.h header" 2013-09-11 21:48:59 +00:00
Kenny Root
26cfc08add Use canonical UniquePtr.h header 
Change-Id: Iab1dc428c2330a07a5944a1cfbb25c8134b11950
 2013-09-11 14:38:56 -07:00
Kenny Root
312431216f am cabc0202: Merge changes I52418ade,Ic02102cb 
* commit 'cabc02029fb9027df7dcde287396ddcc11f3c279':
  Add argument to binder call to check key types
  Provide fallback for keymaster implementations
 2013-09-10 11:09:48 -07:00
Kenny Root
6f149959c7 am c7fe66ea: Merge "Revert to old-style API for EC_KEY handling" 
* commit 'c7fe66ead0ce5fde575359527110fe2616321594':
  Revert to old-style API for EC_KEY handling
 2013-09-10 11:06:31 -07:00
Kenny Root
cabc02029f Merge changes I52418ade,Ic02102cb 
* changes:
  Add argument to binder call to check key types
  Provide fallback for keymaster implementations
 2013-09-10 17:58:58 +00:00
Kenny Root
70f16c1983 Add argument to binder call to check key types 
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

(cherry picked from commit 1b0e393390)

Bug: 10600582
Change-Id: I52418ade881d053229dd3c1d0cf438823468b51b
 2013-09-10 10:58:14 -07:00
Kenny Root
b4d2e0233f Provide fallback for keymaster implementations 
Some implementations won't support ECDSA or DSA, so provide a fallback
for them by using the softkeymaster implementation. This will allow us
to universally support ECDSA and DSA on all platforms regardless of HAL
version.

(cherry picked from commit 17208e0de5)

Bug: 10600582
Change-Id: Ic02102cb2b7f66e2ad3469f4edd9d03c4ae3fdf4
 2013-09-10 10:58:14 -07:00
Kenny Root
c7fe66ead0 Merge "Revert to old-style API for EC_KEY handling" 2013-09-10 17:55:47 +00:00
Kenny Root
77acaa0d42 Revert to old-style API for EC_KEY handling 
Nothing using the EVP_PKEY correctly, so we should revert to the EC_KEY
and ECDSA interfaces. Unfortunately, the SSL client certificate library
uses EC_KEY directly, so just having the EVP_PKEY interface doesn't
work.

Remove the EVP_PKEY interface entirely because it just adds complexity
since the EC_KEY path will do the same thing.

(cherry picked from commit 47041552bd)

Bug: 10655329
Change-Id: Ibf8c36780fe93284b88e91b7860baf1b951b4266
 2013-09-10 10:39:43 -07:00