Commit graph

11 commits

Author SHA1 Message Date
Kenny Root
9d422a535c Revert "Revert "Split up main engine from methods""
Added missing Android.mk change in this commit.

This reverts commit 1fcabcd327.

Change-Id: I71e7fbc8f80a35b4666af985cffb4e7a2eb5634f
2013-06-27 09:15:49 -07:00
Kenny Root
1fcabcd327 Revert "Split up main engine from methods"
This reverts commit 2715806b17.

Change-Id: I7dfaf2cd97a17913710432007a66fc7df6fcad5d
2013-06-27 16:13:34 +00:00
Kenny Root
2715806b17 Split up main engine from methods
We need to add more methods to the keystore engine, so split out RSA so
it doesn't become too unwieldy.

This doesn't affect the size of the symbol table since the default
visibility for this module is "hidden."

Change-Id: I806553a8d1a01ff0ffd7b67054932ddf783bb502
2013-06-26 15:49:34 -07:00
Kenny Root
b51c47df67 Add wrapping capability to keystore engine
Change-Id: Ie71722747b6f0c5f53a8f333e838a54057eb9ab5
2013-02-04 14:32:48 -08:00
Kenny Root
6a9cafc30a Add Android.mk as a dependency as well
Change-Id: I19e91eb766fcc55e9a610421a67a7c8706fdaa46
2012-11-16 12:53:42 -08:00
Kenny Root
07438c8d72 Switch keystore to binder
Change-Id: I6dacdc43bcc1a56e47655e37e825ee6a205eb56b
2012-11-14 11:56:24 -08:00
Kenny Root
938a991106 Clear out ENGINE flags when initializing
We don't need our engine to be copied when initialized with
ENGINE_by_id, so just make sure our flags are cleared when we
initialize.

Change-Id: Ie75fad37c2f78a769c425889c1d0661b468cd0c7
2012-08-15 22:29:23 -07:00
Brian Carlstrom
a8c703d9fd Handle keynames with special characters such as - and .
Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug: 6837950

(cherry-picked from 0114bd9f9b)

Change-Id: I0c265fe73c1b2c430ffd196a21691264f8f3b555
2012-07-18 16:32:17 -07:00
Kenny Root
bef8083783 Only initialize ex_data if not already
ENGINE_by_id will load up multiple copies of the engine which will
create a new ex_data index each time it's called. This change makes sure
the ex_data index is only initialized once.

Change-Id: I5e197faf6273ec3b3cafcbeadf7da8ec04a4f50b
2012-05-03 13:53:03 -07:00
Colin Cross
98c2f8fcc1 use UniquePtr.h from frameworks/native
Use the UniquePtr.h include from frameworks/native/include/utils
to fix the pdk build.

Change-Id: Ic415b43d2eb8c0b7ef54b6f3f75b7fa0d5f7a058
2012-03-28 09:44:58 -07:00
Kenny Root
70e3a86abd Add keymaster to keystore with soft implementation
Add hardware crypto capabilities to keystore. This allows hardware
escrow of private key material.

There is also an OpenSSL engine that connects to keystore to allow use
of the keystore keys from native code built into the platform.

This includes a software implementation of keymaster using OpenSSL
as the backend.  This is just as insecure as the previous solution,
but it's needed so devices without hardware support can continue
to operate in the new scheme without a lot of compatibility code.

Change-Id: I2bc67766e1f633ef1cbbd2874a65962074e84f4f
2012-03-21 17:12:27 -07:00