* Disable an odd, 192-bit curve that BoringSSL no longer supports.
* Only set the "ASN.1 flag" w...

* commit '31e27468b6d822adbd2aec9219a68c206aa6957c':
isEmpty checks all files like reset

Since reset deletes all files in a user directory, change isEmpty to
alse look at all files in t...

* commit 'f583a75c0940218c3df0170b514bcba1c992aecf':
Comment out unused parameter.

BUG: 17281763
Change-Id: I1881e31893cd2d84389e4b29a4408d58654c20ca

* commit 'b4918b9a2794a2afae08d5f8cddad639011343f1':
Build keystore in 32 bit on platforms tha...

* commit '4e865753346fc6a075966972a7a98051818859db':
APIs for syncing password between profiles

Change-Id: I29543f72ef677870aa3f108c1ae4cb029df2f871

* commit '4a16cd72102c5b0aeb2690edb5aac1c4d0e1b7fa':
Build keystore in 32 bit on platforms tha...

Change-Id: I29543f72ef677870aa3f108c1ae4cb029df2f871

Bug: 16233206.
Change-Id: I7941707ca66ac25bd122fd22e5e0f639e7af697e

* commit '05e449a0e419967ef623804de8d1ae5b3be0e9ce':
Correct double-convert from uid to userid

* commit '50122db50bcb6c1aab50ef235c8f9d264b50e97a':
Correct double-convert from uid to userid

This was making readMasterKey and writeMasterKey always operate on
user 0, because of a double-d...

This was making readMasterKey and writeMasterKey always operate on
user 0, because of a double-d...

* commit '931fac098f2ae35aa1da26ced57962c9a21f95cf':
keystore: fully reset user keystore on re...

* commit 'a62474699a202588609d7051e677f23734151900':
keystore: allow system to clear keys even...

* commit 'cf5a7fc9fbaa8a084fb874ad2d6780c6914cd278':
keystore: fully reset user keystore on re...

The reset was improperly skipping the .masterkey file which left
keystore in a "LOCKED" state ne...

* commit 'd5d811e4abab80dc3e1a74708246ec200dbcc335':
keystore: allow system to clear keys even...

Since we can store keys that are unencrypted, we should allow the
clearing of data for apps when...

Since we can store keys that are unencrypted, we should allow the
clearing of data for apps when...

The reset was improperly skipping the .masterkey file which left
keystore in a "LOCKED" state ne...

* commit '00b27fc4f545d9d5930e496567d34868ee7eb234':
Add calls for SELinux MAC checks in keyst...

* commit '0387a7fd23021b904612101b727a2060847f6169':
Add calls for SELinux MAC checks in keyst...

Add call to SELinux in the has_permission function call. Add
mapping of permission to string use...

* commit '1bed3f000cfa5f89a0094fae9fd61c80bfaaf620':
Revert "Add calls for SELinux MAC checks ...

* commit '9421618b6b62b56a25f2d8f24edd2d5f68653f4e':
Revert "Add calls for SELinux MAC checks ...

getcon fails if SELinux is disabled. Revert for now until
a more appropriate fix is made.

This ...

* commit 'e24fbbaef5bd3d7e4f473d2a7cfa114bfefe0bca':
Add calls for SELinux MAC checks in keyst...

* commit 'bbf064bb56902ea629305cb435d55fe83e7532ba':
Add calls for SELinux MAC checks in keyst...

Add call to SELinux in the has_permission function call. Add
mapping of permission to string use...

* commit 'd776bbd593a993c4033f20728fe1a6695f1411cf':
Fix softkeymaster EC group memory leak.

* commit '4bbc12a092008b14ca8db6487435de42d1e54ec1':
Fix softkeymaster EC group memory leak.

* commit '35dadbc8d83dff4fd5c3fb90cc4bf1c5f37b865c':
Use template instead of macro to release ...

* commit '9f64567d9f5e7c7db3b62869a1c199f4ff7d3691':
Use template instead of macro to release ...

* changes:
Use template instead of macro to release UniquePtrs.
Make usage of new/delete and...

* commit '9ee34c2f3b7a2f968d023853be9dc7d200331df5':
Reformat software keymaster with clang-fo...

EC_KEY_set_group dups the group passed to it rather than taking ownership.

Change-Id: Id9560b58...

Change-Id: Icb6674517ed48e3f4bb56818eef0c0756d6dd3d3

All buffers returned to the caller should be allocated with malloc,
since the caller assumes it'...

* commit 'f7386706a1d92eefdc02f359aa46cfe33f2d158a':
Reformat software keymaster with clang-fo...

I'm going to be making extensive changes in these files so it's
convenient to apply clang-format...

This reverts commit 33ddab810194bfdfb7d15c7b8b01394dddd80d39.

Change-Id: Iafac7c1f8a1bc21ffeb9e...

I'm going to be making extensive changes in these files so it's
convenient to apply clang-format...

* commit '3080ea76d2c8b823444a1cab9ec0fcd042f7d01c':
Add support for specifying which key type...

* commit 'fba667fca3fce012bc5d4703f0e2d4f3ef06cfb6':
Add support for specifying which key type...

(cherry picked from commit 1d448c074a86ef5d05a22fdf1358718976628a86)

Change-Id: I8ca9e91048c6bc...

(cherry picked from commit 1d448c074a86ef5d05a22fdf1358718976628a86)

Change-Id: I8ca9e91048c6bc...

* commit 'bb15653d4ffdb14082d091a303e946a010154544':
Add support for specifying which key type...

Change-Id: Ia5a331868ea3e09891c52bbabc2942554253c458

* commit 'a7700b7300b4c136c34ecdacfe6bd581357ede88':

* commit 'b2197930d7a734692392a8d8d6a4bfaf146a7f2f':

* commit '9ffe9be8dd27def3f674da90cf9619437e3d428c':
Fix the Vector erase bug

* commit '9ffe9be8dd27def3f674da90cf9619437e3d428c':
Fix the Vector erase bug

* commit 'afd757283285c3859fcf00990b07d8f5a9e3ae02':
keystore: fix errors inside ALOGV

* commit 'afd757283285c3859fcf00990b07d8f5a9e3ae02':
keystore: fix errors inside ALOGV

Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I42752d163beb...

* commit '495a95d490e5e1a13a69fefb338473ada12495e3':
system/security: convert LOCAL_MODULE_PAT...

LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH....

In the Vector traversal and delete operation, we can't
move to the next item when we use the era...

* commit 'e040a5710561686d70d110e3cc1bcafedbeb7ec2':
Use %zu, %td for size_t, ptrdiff_t, respe...

Changing ALOG format strings to %zu (for one size_t integer) and to
%td (for a couple of pointer...

* commit 'd0f35a1a30c51a26c0a50922736d804f40c2f9aa':

* commit 'c55921b02233fdbc68491e814a01eb2b6996ff6a':

* commit '8d01e624d52d1c34de5926b5bc47d265532a9527':
softkeymaster: do not use GNU old-style f...

Fix the following:
error: use of GNU old-style field designator extension

Change-Id: Id77d4d5cd...