diff options
| author | Shawn Willden <swillden@google.com> | 2015-05-25 23:12:48 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-05-31 09:28:56 -0600 |
| commit | 0629810b145187575bc26c910dded0d24c64569d (patch) | |
| tree | 5c1309696f2205777f6aad1c1b5b65aeaa64c9b7 /key.cpp | |
| parent | 6270aca8571399aca8ea538acd7386ddecdcc112 (diff) | |
| download | android_system_keymaster-0629810b145187575bc26c910dded0d24c64569d.tar.gz android_system_keymaster-0629810b145187575bc26c910dded0d24c64569d.tar.bz2 android_system_keymaster-0629810b145187575bc26c910dded0d24c64569d.zip | |
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
Diffstat (limited to 'key.cpp')
| -rw-r--r-- | key.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -14,6 +14,8 @@ * limitations under the License. */ +#include <assert.h> + #include "key.h" #include <openssl/x509.h> @@ -22,9 +24,6 @@ namespace keymaster { -/* static */ -template <> KeyFactoryRegistry* KeyFactoryRegistry::instance_ptr = 0; - Key::Key(const AuthorizationSet& hw_enforced, const AuthorizationSet& sw_enforced, keymaster_error_t* error) { assert(error); @@ -34,4 +33,5 @@ Key::Key(const AuthorizationSet& hw_enforced, const AuthorizationSet& sw_enforce if (authorizations_.is_valid() != AuthorizationSet::OK) *error = KM_ERROR_MEMORY_ALLOCATION_FAILED; } + } // namespace keymaster |