summaryrefslogtreecommitdiffstats
path: root/key.cpp
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-01-20 11:45:11 -0700
committerShawn Willden <swillden@google.com>2015-01-20 11:45:11 -0700
commit4d024ce238501af7dba0a6296ab7511e75c27a98 (patch)
treee59c626a5fd3b8782f0dcd4420292cb7b6dac2b1 /key.cpp
parentd63e305b37d234cd577aed06f1e1281ccfe640a4 (diff)
downloadandroid_system_keymaster-4d024ce238501af7dba0a6296ab7511e75c27a98.tar.gz
android_system_keymaster-4d024ce238501af7dba0a6296ab7511e75c27a98.tar.bz2
android_system_keymaster-4d024ce238501af7dba0a6296ab7511e75c27a98.zip
Revert "Add AES key generation support."
This reverts commit b949a3fafd73ea77efa579be72e2706cd064071a.
Diffstat (limited to 'key.cpp')
-rw-r--r--key.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/key.cpp b/key.cpp
index 8ee0656..596f428 100644
--- a/key.cpp
+++ b/key.cpp
@@ -16,7 +16,6 @@
#include <openssl/x509.h>
-#include "aes_key.h"
#include "dsa_key.h"
#include "ecdsa_key.h"
#include "openssl_utils.h"
@@ -68,8 +67,6 @@ Key* Key::GenerateKey(const AuthorizationSet& key_description, const Logger& log
return DsaKey::GenerateKey(key_description, logger, error);
case KM_ALGORITHM_ECDSA:
return EcdsaKey::GenerateKey(key_description, logger, error);
- case KM_ALGORITHM_AES:
- return AesKey::GenerateKey(key_description, logger, error);
default:
*error = KM_ERROR_UNSUPPORTED_ALGORITHM;
return NULL;