History log of /system/keymaster/Android.mk
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c15af1910d8f451341d0068b5533816ace5defec 10-Mar-2016 Shawn Willden <swillden@google.com> Implement key version binding.

Change-Id: If0f3bc12380b8b65bf1e60d5d8d039eb972c8a15
/system/keymaster/Android.mk
da1a18074fe94a04d77fe00c3fa25852ef56ecdc 28-Jan-2016 Shawn Willden <swillden@google.com> Force use of clang compiler.

Change-Id: Ie8c6ad28ab2007efbb56e72cf64852a2d5f755bc
/system/keymaster/Android.mk
239c1664173c941038a1d1d13626e58ce3cef819 06-Jan-2016 Shawn Willden <swillden@google.com> Add utilities to format/parse ASN.1 attestation records.

Bug: 22914603
Change-Id: I9279df29ec06e07fbd60427e22b8f7a74648c8ed
/system/keymaster/Android.mk
78c5d8796c560deb2a0194f581f13a833437f012 08-Jan-2016 Shawn Willden <swillden@google.com> Refactor keymaster tags.

This refactor separates declaration and definition of the tag
instances, so they don't get duplicated in every compilation unit.
Also, if tag names are enabled it provides a dynamically-generated map
from tags to names. This is only for testing/debugging use, but it's
very convenient for that. The test utils are updated to take advantage
of it.

Change-Id: I13ad2564e4a850c6b268a2cd1b3f5a37037ea6b7
/system/keymaster/Android.mk
f7538e0127ec2cb5202b0cbc64ad8305aae6243b 21-May-2015 Quan Nguyen <quannguyen@google.com> KDF1 and KDF2

Change-Id: I34a1116adf650eb5fe7937940d7bb768fd28b9a1
/system/keymaster/Android.mk
fabacaf3e6019804cc8a98a2b8296be1d0125519 26-Mar-2015 Thai Duong <thaidn@google.com> ECIES: add ECIES-KEM. This version supports HKDF and ECDH with NIST curves.

Change-Id: I5af3215e96bb015049574aa18327cd7f7499dbd3
/system/keymaster/Android.mk
1181779c5e6c8627b94067d86db6a2f7d5309674 23-Nov-2015 Shawn Willden <swillden@google.com> Revert "ECIES: add ECIES-KEM. This version supports HKDF and ECDH with NIST curves."

This reverts commit 41998988331ff38e922a59ef008896beb3145ba0.

Change-Id: Ifed6b4e5a69310770373a396271f02da5c9d8934
/system/keymaster/Android.mk
41998988331ff38e922a59ef008896beb3145ba0 26-Mar-2015 Thai Duong <thaidn@google.com> ECIES: add ECIES-KEM. This version supports HKDF and ECDH with NIST curves.

Change-Id: Iea5877eba0a9b13610d3d1b33d04b5657edc3550
/system/keymaster/Android.mk
55cb28cda166b8de6df11d87bbd8fa8655f09146 26-Sep-2015 Ying Wang <wangying@google.com> resolved conflicts for e6e2f665 to mnc-dr-dev-plus-aosp

Change-Id: I3f2b6918a6f052e9ed426784ad34eb25ef6683b4
e6e2f6658a6fe97eaa0afda2881f928a0227720c 24-Sep-2015 Shawn Willden <swillden@google.com> Add a faux library libkeymasterfiles to export source.

The library contains nothing, but it exports everything in keymaster as
an include file, enabling it to be #included in other projects. This is
to make it easy to build keymaster for TLK.

Bug: 24372377
Change-Id: I0f9fd30e2feb1d89a8ff199567ce1ec6b037e236
/system/keymaster/Android.mk
1931304e710aadb4098cfb94daa4458e64cf0515 21-Sep-2015 Ivan Krasin <krasin@google.com> am e4c6aed4: am 481722ef: Avoid fuzzer instrumentation for keymaster as it currently crashes Clang

* commit 'e4c6aed4de85dea8e887edabba65572c46612b47':
Avoid fuzzer instrumentation for keymaster as it currently crashes Clang
481722ef249e3dd6de59b0e1e07fc5491e34c42e 16-Sep-2015 Ivan Krasin <krasin@google.com> Avoid fuzzer instrumentation for keymaster as it currently crashes Clang

Bug: 22850550
Change-Id: Id9bfb595afaa421a1872fcdcda553b4b1b319b0a
/system/keymaster/Android.mk
d599b15c0693950bdc72fb867872044fdc484ef5 28-Jul-2015 Shawn Willden <swillden@google.com> Do digesting, and sometimes padding, in SW when HW doesnt.

The keymaster1 specification only requires HW modules to implement
SHA256 out of the list of keymaster1 digest modes. That would force
many keys to be software only, and would break legacy scenarios. This
change uses SoftKeymasterDevice to front keymaster modules that don't
implement the full suite of digests, quietly inserting KM_DIGEST_NONE
and KM_PAD_NONE into key generation/import requests when necessary, then
performing the digesting, and sometimes padding, in software, then
delegating crypto operations to the hardware.

This is only done for RSA and EC keys. Software digesting isn't
possible for HMAC or AES-GCM keys.

Note that this is not the complete fix for the bug. Some changes in
keystore are also required, coming in another CL.

Bug: 22529223
Change-Id: I740572eb11341fb0659085309da01d5cbcd3854d
/system/keymaster/Android.mk
15957bb84c5b45add8c0e86407c1aa3053ea34c5 18-Jun-2015 Shawn Willden <swillden@google.com> Update KeymasterEnforcement.

This brings KeymasterEnforcement up to date and cleans it up, making the
code more consistent with the rest of keymaster. It also makes it
possible to use from Trusty, by virtualizing some time-related functions
that don't work the same in Trusty-land.

Bug: 19511945
Change-Id: I1141c953f227f3ef8a78751d9f04bf4e4922d1f5
/system/keymaster/Android.mk
b5508298cdb1d42eaf8c81aa8a6ac2cbfdeef3c7 18-Jun-2015 Shawn Willden <swillden@google.com> Update KeymasterEnforcement.

This brings KeymasterEnforcement up to date and cleans it up, making the
code more consistent with the rest of keymaster. It also makes it
possible to use from Trusty, by virtualizing some time-related functions
that don't work the same in Trusty-land.

Bug: 19511945
Change-Id: I1141c953f227f3ef8a78751d9f04bf4e4922d1f5
/system/keymaster/Android.mk
5d10102ebab4ff24013e4e9f3e7244a631c7fd8b 03-Jun-2015 Chad Brubaker <cbrubaker@google.com> Fix unused variable issues

Also adds -Wunused to bring gcc's -Werror inline with clang's to prevent
similar build errors later.

Bug:21583577
Change-Id: Ia051adbb3ea92a8ace914ad958a73348d70cca17
/system/keymaster/Android.mk
5a9305c82f2d630f54352d649bb69b4c554c1b32 28-May-2015 Shawn Willden <swillden@google.com> Move assymetric key factory declarations to includes.

This exposes EcKeyFactory and RsaKeyFactory so they can be used for
constructing the Trusty KeymasterContext. Note that there are no code
changes, just reorganization.

Cherry-picked from internal.

Change-Id: I761ac591e536011e1a31c85bb7c9e5a942f70a6f
/system/keymaster/Android.mk
8a58c2be4e1149fc2a79133e740319b9609496a8 26-May-2015 Shawn Willden <swillden@google.com> Another refactor, deleting AbstractFactoryRegistry.

I should have known better than to make these singletons to begin
with. Globals create problems. This undoes that mistake.

Cherry-picked from internal.

Change-Id: Ic258b107d17527b5feffd7e61889cadfee339f08
/system/keymaster/Android.mk
24bdfc2558c96c76e850e7c366618c638efeb1c4 26-May-2015 Shawn Willden <swillden@google.com> Delegate ECDSA keys to keymaster0 in SoftKeymasterDevice.

Cherry-picked from internal

Bug: 20912868
Change-Id: Idd4057481fbec975d5d59e2b31c912f8edad1ed9
/system/keymaster/Android.mk
ac3980627ab3420463ca787be441ac363726ed12 21-May-2015 Shawn Willden <swillden@google.com> Delegate RSA keys to keymaster0 in SoftKeymasterDevice.

Cherry-picked from internal.

Bug: 20912868
Change-Id: I34d9d08bf1df4bfd2e53d9c36401a195f315cbd3
/system/keymaster/Android.mk
32f6b0521e7225f3de8005b4f6efbe3e4c782693 26-May-2015 Shawn Willden <swillden@google.com> Large refactor to move context out of AndroidKeymaster.

Cherry-picked from internal.

Change-Id: I84d04d79e04b3f2535587efc3c83e30efc8bb5fd
/system/keymaster/Android.mk
3e37f0a2c3ccd3606aed6dc4aea4a2c8c6cf7f55 03-Jun-2015 Chad Brubaker <cbrubaker@google.com> Fix unused variable issues

Also adds -Wunused to bring gcc's -Werror inline with clang's to prevent
similar build errors later.

Bug:21583577
Change-Id: Ia051adbb3ea92a8ace914ad958a73348d70cca17
/system/keymaster/Android.mk
398c158a0206217025f327c2d26bb6c86659f5a0 28-May-2015 Shawn Willden <swillden@google.com> Move assymetric key factory declarations to includes.

This exposes EcKeyFactory and RsaKeyFactory so they can be used for
constructing the Trusty KeymasterContext. Note that there are no code
changes, just reorganization.

Change-Id: I8e8e068fb875f9d9c5c35320a545347dc33bc507
/system/keymaster/Android.mk
0629810b145187575bc26c910dded0d24c64569d 26-May-2015 Shawn Willden <swillden@google.com> Another refactor, deleting AbstractFactoryRegistry.

I should have known better than to make these singletons to begin
with. Globals create problems. This undoes that mistake.

Change-Id: Idf61d5f72e3c34b5c4ddb27cc94b05f506561743
/system/keymaster/Android.mk
6270aca8571399aca8ea538acd7386ddecdcc112 26-May-2015 Shawn Willden <swillden@google.com> Delegate ECDSA keys to keymaster0 in SoftKeymasterDevice.

Bug: 20912868
Change-Id: If63899e3244aed45d939d0165e6d94a1caa9d220
/system/keymaster/Android.mk
2beb628bfefae72fa6bb84a6235da7e3de532823 21-May-2015 Shawn Willden <swillden@google.com> Delegate RSA keys to keymaster0 in SoftKeymasterDevice.

Bug: 20912868
Change-Id: I515a125f1247357d2cd9b4633c3b223590848093
/system/keymaster/Android.mk
0caaade6a405560f23102729c6e1bb5319d9db9c 16-May-2015 Shawn Willden <swillden@google.com> Remove references to Google in Android keymaster reference implementation.

Change-Id: I05de61353fc806b90232fab7c1d1cf76aefa35fc
/system/keymaster/Android.mk
0cb6942d3efb6c056f96321c82a4b3d86af601d6 26-May-2015 Shawn Willden <swillden@google.com> Revert "Revert "Large refactor to move context out of AndroidKeymaster.""

This reverts commit 13fbe3e93247943c26e7ca2ed27b6d650282b8bf.

Bug: 20912868, 19799085
Change-Id: Iadd6ce5cbe94956c2a2fe277f1bf5b108e4bcf57
/system/keymaster/Android.mk
13fbe3e93247943c26e7ca2ed27b6d650282b8bf 23-May-2015 Shawn Willden <swillden@google.com> Revert "Large refactor to move context out of AndroidKeymaster."

This reverts commit 8ba2a043f0d44ad3f58d4af518f9391c03eca9c3.

I need to update the Volantis non-secure code in sync. Reverting while I get that done.

Change-Id: I0fb9f928e7e624ad678050a04bb873b43b1c9a48
/system/keymaster/Android.mk
8ba2a043f0d44ad3f58d4af518f9391c03eca9c3 18-May-2015 Shawn Willden <swillden@google.com> Large refactor to move context out of AndroidKeymaster.

AndroidKeymaster made a number of assumptions about its context that are
really only valid for TEE-based usage. In addition, KeyFactory made
some similarly TEE-focused assumptions about key blob creation and
parsing.

Both concerns have been moved to a new KeymasterContext class, which is
responsible for building and parsing key blobs in a manner appropriate
for the context in which AndroidKeymaster is running, as well as
providing other context-specific services, such as random number
generation.

In addition, the refactor reduces the need for the KeyBlob and
UnencryptedKeyBlob classes, which encode too many assumptions about blob
formatting and encryption, to the point that they can be removed and
replaced by a handful of utility functions which are much cleaner and
more flexible.

How to review this CL:

I looked hard at breaking this up into smaller CLs, but it's mostly not
feasible. However, it's probably easier to approach it by starting with
the fundamental changes, and then looking at the cascade effects.

1. Look at keymaster_context.h. The core of the change was pulling this
set of features out of AndroidKeymaster. Note that the revised approach
to key blob creation does not involve the KeyBlob and UnencryptedKeyBlob
classes, but instead goes directly from raw key material plus ancillary
data (e.g. auth sets) to a serialized buffer ready to return to
keystore. The same is true in reverse direction for parsing key blobs.

2. Look at key.h. The revised KeyFactory GenerateKey, ImportKey and
LoadKey methods are essential. GenerateKey and ImportKey no longer
produce a Key object, because all that's needed is a returnable blob.
LoadKey produces a Key object, but it starts with raw key material,
rather than an UnencryptedKeyBlob. Also note the change to the Key
class; because Key objects are only created by LoadKey, when there's a
need to use a key, there's only one constructor.

3. Look at asymmetric_key.h, rsa_key.h and rsa_key.cpp. rsa_key.cpp
provides a good example of how the new structure works. GenerateKey and
ImportKey do all of the work necessary to produce an OpenSSL RSA key and
extract the internal representation (using EvpToKeyMaterial; defined in
asymmetric_key.h because it's the same for EC keys). Then, with the raw
key data in hand, they call KeymasterContext::CreateKeyBlob to wrap the
key data in a key blob that can be returned to the caller -- whatever
that wrapping means in the current context. There's a subtlety not
apparent here which is crucial to the rationale for the refactoring:
RsaKeyFactory uses KeymasterContext::get_instance to retrieve the
context, but key factories which depend on operating in a particular
context can use a different way to get their context object, which may
have a larger interface. RsaKeymaster0KeyFactory will do this.

4. Look at soft_keymaster_context. In
particular, SoftKeymasterContext::CreateKeyBlob and ParseKeyBlob.
CreateKeyBlob allocates authorization tags from key_description to
hw_enforced and sw_enforced, then encrypts the key material and
serializes it to a blob. This approach is compatible with the keys
softkeymaster has been producing, but I'm going to change it (post M),
because there's no reason to bother encrypting SW keys with a SW key.
ParseKeyBlob reverses the process to recover the unencrypted key
material and the auth lists. One debatable point was the decision to
implement BuildHiddenAuthorizations and SetAuthorizations here, since
all contexts will need something similar, and they really should all do
it the same. I may refactor later to pull that functionality up to
KeymasterContext; it will depend on what I learn implementing
TrustyKeymasterContext and HybridKeymasterContext (used for the
keymaster0 adapter).

5. Look at ocb_utils and auth_encrypted_key_blob. These contain the key
encryption and key blob serialization code which was formerly split
between AndroidKeymaster::SerializeKeyBlob, UnencryptedKeyBlob and
KeyBlob, now divided into separate encryption and serialization
utilities. Note the refactored key_blob_test.cpp, updated to use the
new utilities rather than UnencryptedKeyBlob.

6. Look at soft_keymaster_device.cpp. Since KeyBlob no longer exists to
provide a nice way to peer into a blob to extract the algorithm, for use
in determining how to parse the keymaster0 signing key params (which
come in as a void*, yuck), we now have to use get_key_characteristics to
recover the params. This was the right way all along; the device layer
should not depend on being able to parse key blobs.

7. The rest.

Bug: 20912868, 19799085
Change-Id: Ieb74b8da39974f674eb8baa959bde75011fdd2e8
/system/keymaster/Android.mk
b6837e7a62a1192e33beef586282812239ee8b28 16-May-2015 Shawn Willden <swillden@google.com> Remove references to Google in Android keymaster reference implementation.

Change-Id: I05de61353fc806b90232fab7c1d1cf76aefa35fc
/system/keymaster/Android.mk
ba1148cdfa85a27f90d78a92d8b90972cf15ddb4 05-May-2015 Shawn Willden <swillden@google.com> Rename unit test executable to something sane.

Change-Id: I0c2221e342fd4a3538d60a6af6965f72a58cf812
(cherry picked from commit 9565009d5b3286077de58d95c394001417dc650d)
/system/keymaster/Android.mk
a82a6d7a9eda54b53d8e95903f349a6f911f1db7 05-May-2015 Shawn Willden <swillden@google.com> Rename unit test executable to something sane.

Change-Id: I0c2221e342fd4a3538d60a6af6965f72a58cf812
/system/keymaster/Android.mk
72a5fdde1095cc012b232987d1f02de9b0507b89 18-Mar-2015 Shawn Willden <swillden@google.com> Modify unit tests to run on-device as well as on the dev machine.

Change-Id: Icdab36a8e4fe97deb112df7ae59e97317f7e991b
/system/keymaster/Android.mk
7689ed6e95e5cb712c4983cb30ad383520cfaa33 21-Mar-2015 Thai Duong <thaidn@google.com> ECIES: add HKDF (specified in RFC 5869) using HMAC-SHA256

Change-Id: I18cf63b6454d3d11386e9de93d934d759e0abc0e
/system/keymaster/Android.mk
aab6d5768e89cc6b1af249ff2e4b9f90e788ef58 24-Mar-2015 Alex Klyubin <klyubin@google.com> Revert "ECIES: add HKDF (specified in RFC 5869) using HMAC-SHA256"

This reverts commit 207b505371394dbf2118ca2beb8817cf4c617988.

Change-Id: I2ff88a283517b4829b9a48e064f73373638d0e36
/system/keymaster/Android.mk
207b505371394dbf2118ca2beb8817cf4c617988 21-Mar-2015 Thai Duong <thaidn@google.com> ECIES: add HKDF (specified in RFC 5869) using HMAC-SHA256

Change-Id: I5dafc61aecdfd4d38aba0c1beb1b03716e212723
/system/keymaster/Android.mk
d835cc86e08adff36bde154e81c376168a386ce6 17-Mar-2015 Shawn Willden <swillden@google.com> Refactor of keymaster build, to suppor keystore unit test build.

Bug: 19511945
Change-Id: Ic010aa8b35e663da9bfb1a2e9d834d7045e11bbd
/system/keymaster/Android.mk
f01329d8692edde9a9ffb88f29f5d684eab481e2 12-Mar-2015 Shawn Willden <swillden@google.com> Improve error reporting and logging.

Bug: 19603049
Bug: 19509317
Change-Id: I041c973802e6c567adc5b1f280fc5bac27ba28d6
/system/keymaster/Android.mk
f862a764e4d20495d484664de852e4d6de26f08b 18-Mar-2015 Thai Duong <thaidn@google.com> ECIES: refactoring EC code by moving common interfaces to EcKey

Change-Id: I6a0c5dfa8072c6f82f77316a2e8b2252d976ae0f
/system/keymaster/Android.mk
23d4a742109fa29d6be20d3dc56a1b48797fe7b2 19-Mar-2015 Shawn Willden <swillden@google.com> Revert "Revert "Refactor GoogleKeymaster's operation table to a new class.""

This reverts commit 5a665cdeb6b4e44c57b0c0855e09045f8e2d2226. It also
incorporates one small change: operation_table.h #includes keymaster_defs.h
rather than keymaster1.h. This is important to avoid breaking Trusty.

Change-Id: Ia320d8599ea1d73930669fa61a82201ec1f833e8
/system/keymaster/Android.mk
bfd323c639dae9a9c8f386cf099aec3e810a934b 19-Mar-2015 Shawn Willden <swillden@google.com> Revert "Refactor GoogleKeymaster's operation table to a new class."

This reverts commit 09d4ba3322e9a8b7c0e2d4a6c3dcacd7aed5ae22.

This is to unbreak Trusty build.

Change-Id: I47f90516a9e80e0c24bcea956072226bb7829991
/system/keymaster/Android.mk
09d4ba3322e9a8b7c0e2d4a6c3dcacd7aed5ae22 04-Mar-2015 Shawn Willden <swillden@google.com> Refactor GoogleKeymaster's operation table to a new class.

This makes it reusable for Keymaster0Adapter.

Bug: 19508876
Change-Id: I38bdcf2ef9e9945ded2f15172962f6a997279100
/system/keymaster/Android.mk
4d306ec792b4348253aa77dff965bff5def1dccb 04-Mar-2015 Shawn Willden <swillden@google.com> Factor PKCS8 to EVP conversion out of AsymmetricKey.

Bug: 19508876
Change-Id: I7d5a7363a43c47dc33b0de53040b593de096e1c3
/system/keymaster/Android.mk
fdd6a6f5e60b8d0b513ffed84ca59b4b6ffef19c 11-Mar-2015 Shawn Willden <swillden@google.com> Rename libkeymaster to avoid collision with fugu libkeymaster.

Change-Id: Id9547b73d0519517b328e31d45e9d96ba9155c39
/system/keymaster/Android.mk
a803cef337b5c7950df5a568fc8183295195ff00 11-Mar-2015 Chad Brubaker <cbrubaker@google.com> Add missing LOCAL_C_INCLUDES

Change-Id: Ibd4c8f5f779fa6da1d8dc4a86ee9595fb98e8c70
/system/keymaster/Android.mk
cd695824a87fa9adc2d287012ddc791bb2ec63cd 26-Jan-2015 Shawn Willden <swillden@google.com> Implement AddRngEntropy.

Change-Id: I8308b23d900b0f6132dd480516e123c82ee8bcb3
/system/keymaster/Android.mk
567a4a04f43d35b785d50508e6459b01f2ab4d14 31-Dec-2014 Shawn Willden <swillden@google.com> Switch to using global logger

Change-Id: I7af02342320a9a431cd9845baaf5dbcf61d460c2
/system/keymaster/Android.mk
31359caa7577608a97d1b649fdd3a34fac84ba90 26-Feb-2015 Chih-Hung Hsieh <chh@google.com> Enable clang compilation.

Cherry pick OPTNONE solution for memset_s from google master branch.
Ignore benign warnings.

Change-Id: I4ed559449be2f9c4277835f10465d4f60060c2ff
/system/keymaster/Android.mk
26aaa76e18a1a1bc92c7d5ee6ecc62769dd764ec 07-Feb-2015 Shawn Willden <swillden@google.com> Add OpenSSL error translation utility.

Bug: 19507949
Change-Id: I8d499868173e476f5e9f92a7b0e518c3163815ac
/system/keymaster/Android.mk
538b0654fd5096841e12da15271c74429a37be18 31-Dec-2014 Shawn Willden <swillden@google.com> Refactor logging, to stop passing Logger references everywhere.

Change-Id: I9380c21872710743413ca6a4340ae19f58b1e983
/system/keymaster/Android.mk
63ac043f81f8e2a15bbadcb6628b92096295ab6a 29-Dec-2014 Shawn Willden <swillden@google.com> Refactor operation creation to use an operation factory registry.

Also modify GoogleKeymaster to query the operation factories to get
lists of supported modes and digests.

Change-Id: Ied30185df5dddaeaeb1106df63237757896d77db
/system/keymaster/Android.mk
f917c04ce7c39e627ce285d2ff3bff5fa679cb4b 17-Feb-2015 Chad Brubaker <cbrubaker@google.com> Rename soft_keymaster_device to libsoftkeymaster

libsoftkeymaster will be loaded by keystore as a fallback device to use
when the hardware keymaster doesn't support certain types of keys.

This also moves the lib from /lib/hw to /lib since it doesn't currently
work for loading via HAL and /lib/hw isn't in the default library path.

Change-Id: Id32418eccde7997479e5a122c047c2f06bff6475
/system/keymaster/Android.mk
0d560bfedd40389387f31f6696660fff6bc3a48a 16-Dec-2014 Shawn Willden <swillden@google.com> Add HMAC-SHA256 support.

Change-Id: I64c7bdf77388e3cb491b702c52c6746d32f317b0
/system/keymaster/Android.mk
95e1382b75bab7d8b4cce3c1267fa23df2006957 16-Dec-2014 Shawn Willden <swillden@google.com> Refactor AesKey, extracting most functionality to SymmetricKey.

Symmetric key material handling is the same for all symmetric keys
(except, perhaps, DES if we want to handle parity bits correctly), so
move it into a common base.

Change-Id: I6ad5d35ce9020c1ae155bf0a8f2efe35674b1604
/system/keymaster/Android.mk
7299516c52e31fa82d0689a144999f5c0725ecbd 05-Feb-2015 Shawn Willden <swillden@google.com> Add missing .cpp in Makefile.

Change-Id: I8c9b5fe7474673c54906846129e677e4f0cf6c02
/system/keymaster/Android.mk
5b53c999edcd819ab2e5318bfd4589bc969fcbcc 02-Feb-2015 Shawn Willden <swillden@google.com> Revert "Revert "Add SoftKeymasterDevice""

This reverts commit ecf2ae9fc5fd66a0f12d9adce8aa9010f66ae863.
/system/keymaster/Android.mk
ecf2ae9fc5fd66a0f12d9adce8aa9010f66ae863 29-Jan-2015 Brian Carlstrom <bdc@google.com> Revert "Add SoftKeymasterDevice"

This reverts commit 2079ae8a94f7f19e89d94c842a4f4055bb21c39a.
/system/keymaster/Android.mk
2079ae8a94f7f19e89d94c842a4f4055bb21c39a 22-Jan-2015 Shawn Willden <swillden@google.com> Add SoftKeymasterDevice

SoftKeymasterDevice implements the keymaster HAL API by calling directly
to a GoogleKeymaster instance.

Change-Id: If530b98fecbef05815b685efff9295539614fd52
/system/keymaster/Android.mk
508c34310c6751152d65f7186fd4fdfd80b3adae 09-Dec-2014 Chih-Hung Hsieh <chh@google.com> Disable clang compilation.

This is a temporary solution before we find a way
to suppress clang optimization in memset_s() in
google_keymaster_utils.h.

Change-Id: I0f2a1ead5250bbf6a05c0258fc1d618529bd90f8
/system/keymaster/Android.mk
a3e1e222479758cec6c17e0dc319b1c5d124458f 23-Sep-2014 Shawn Willden <swillden@google.com> Remove libcrypto from libkeymaster_messages.

Change-Id: I31a0f19a55d4c4b15c609dfa6423ad17e39e518a
/system/keymaster/Android.mk
2b3bbf8d918010de02cbf5b6093cda8bcd812ffe 04-Sep-2014 Shawn Willden <swillden@google.com> Make libkeymaster static, and don't build it in 32 bit mode.

Change-Id: I206a60a9bc4c8ce4a58e5ca9879b386560332cda
/system/keymaster/Android.mk
51a11345dfd1acc57d5739640b166caadde0903f 30-Aug-2014 Shawn Willden <swillden@google.com> Make libkeymaster shared, and build it 32-bit when needed.

Change-Id: I55ecc1730af9339fb5cef2618bbc3c4a33868a23
/system/keymaster/Android.mk
98d9b92547a9a7553b99e3e941a4175926f95b62 26-Aug-2014 Shawn Willden <swillden@google.com> Reorganize system/keymaster.

This CL moves the includes that should be exported to include/ and
removes the trusty-specific code (some of which is moving to
hardware/google and some of which is moving to the trusty tree.)

Change-Id: Ie4fabf6b5c5f36b50c2f5ff356548ca2e9140fcb
/system/keymaster/Android.mk
235cd7e70389c42ce26b832ad8ddcfefbc812fb7 21-Aug-2014 Shawn Willden <swillden@google.com> Remove Android.mk to unbreak AOSP build.

Change-Id: I9f78fee36874ff3681b3cc55c2081c1cae8cb343
/system/keymaster/Android.mk
62de26672193373972f2ce968b51cf8335f118f9 20-Aug-2014 Shawn Willden <swillden@google.com> Trusty test app.

Note that this code is in the wrong place. The right place is still
begin created so I'm putting them here for now. We'll move them when
it's ready.

Change-Id: Iab7384a531fd4a935dbeef0aebf2652eb06f6e03
/system/keymaster/Android.mk