commit 125e4866f98eb1b5ad65a563afd34aca215d983d
author Shawn Willden <swillden@google.com> Mon May 11 06:53:34 2015 -0600
committer Shawn Willden <swillden@google.com> Tue May 12 11:29:39 2015 +0000
tree f57ed3560bee9d195bd5b7510e2217915c1ee5c9
parent c442467181d8a9427c83fea4f0a272c8a7b46043

Remove rescoping support.

Change-Id: Ia8e36e41e04f15befccbb7b4138f599849facd28
(cherry picked from commit 0c14b2c5f42abdab58118106d5a7117a88d4a324)

ec_key.h

diff --git a/ec_key.h b/ec_key.h
index 7b23581..1748fe0 100644
--- a/ec_key.h
+++ b/ec_key.h
@@ -25,13 +25,11 @@
 
 class EcKeyFactory : public AsymmetricKeyFactory {
   public:
-    virtual Key* GenerateKey(const AuthorizationSet& key_description, keymaster_error_t* error);
-    virtual Key* ImportKey(const AuthorizationSet& key_description,
-                           keymaster_key_format_t key_format, const uint8_t* key_data,
-                           size_t key_data_length, keymaster_error_t* error);
-    virtual Key* LoadKey(const UnencryptedKeyBlob& blob, keymaster_error_t* error);
-    virtual Key* RescopeKey(const UnencryptedKeyBlob& blob,
-                            const AuthorizationSet& new_authorizations, keymaster_error_t* error);
+    Key* GenerateKey(const AuthorizationSet& key_description, keymaster_error_t* error) override;
+    Key* ImportKey(const AuthorizationSet& key_description, keymaster_key_format_t key_format,
+                   const uint8_t* key_data, size_t key_data_length,
+                   keymaster_error_t* error) override;
+    Key* LoadKey(const UnencryptedKeyBlob& blob, keymaster_error_t* error) override;
 
   private:
     static EC_GROUP* choose_group(size_t key_size_bits);