security: Remove IdentityStorage::getKeyNameForCertificate. Make getNewKeyName not virtual.
diff --git a/include/ndn-cpp/security/identity/basic-identity-storage.hpp b/include/ndn-cpp/security/identity/basic-identity-storage.hpp
index 84f5374..476df56 100644
--- a/include/ndn-cpp/security/identity/basic-identity-storage.hpp
+++ b/include/ndn-cpp/security/identity/basic-identity-storage.hpp
@@ -2,6 +2,7 @@
/**
* Copyright (C) 2013 Regents of the University of California.
* @author: Yingdi Yu <yingdi@cs.ucla.edu>
+ * @author: Jeff Thompson <jefft0@remap.ucla.edu>
* See COPYING for copyright and distribution information.
*/
@@ -56,15 +57,6 @@
revokeIdentity();
/**
- * Generate a name for a new key belonging to the identity.
- * @param identityName The identity name.
- * @param useKsk If true, generate a KSK name, otherwise a DSK name.
- * @return The generated key name.
- */
- virtual Name
- getNewKeyName(const Name& identityName, bool useKsk);
-
- /**
* Check if the specified key already exists.
* @param keyName The name of the key.
* @return true if the key exists, otherwise false.
@@ -73,13 +65,6 @@
doesKeyExist(const Name& keyName);
/**
- * Extract the key name from the certificate name.
- * @param certificateName The certificate name to be processed.
- */
- virtual Name
- getKeyNameForCertificate(const Name& certificateName);
-
- /**
* Add a public key to the identity storage.
* @param keyName The name of the public key to be added.
* @param keyType Type of the public key to be added.
diff --git a/include/ndn-cpp/security/identity/identity-storage.hpp b/include/ndn-cpp/security/identity/identity-storage.hpp
index fdf3d0c..d54bc10 100644
--- a/include/ndn-cpp/security/identity/identity-storage.hpp
+++ b/include/ndn-cpp/security/identity/identity-storage.hpp
@@ -59,8 +59,8 @@
* @param useKsk If true, generate a KSK name, otherwise a DSK name.
* @return The generated key name.
*/
- virtual Name
- getNewKeyName(const Name& identityName, bool useKsk) = 0;
+ Name
+ getNewKeyName(const Name& identityName, bool useKsk);
/**
* Check if the specified key already exists.
@@ -71,13 +71,6 @@
doesKeyExist(const Name& keyName) = 0;
/**
- * Extract the key name from the certificate name.
- * @param certificateName The certificate name to be processed.
- */
- virtual Name
- getKeyNameForCertificate(const Name& certificateName) = 0;
-
- /**
* Add a public key to the identity storage.
* @param keyName The name of the public key to be added.
* @param keyType Type of the public key to be added.
@@ -158,10 +151,7 @@
* @return The default certificate name.
*/
Name
- getDefaultCertificateNameForIdentity(const Name& identityName)
- {
- return getDefaultCertificateNameForKey(getDefaultKeyNameForIdentity(identityName));
- }
+ getDefaultCertificateNameForIdentity(const Name& identityName);
/**
* Get the default certificate name for the specified key.
diff --git a/include/ndn-cpp/security/identity/memory-identity-storage.hpp b/include/ndn-cpp/security/identity/memory-identity-storage.hpp
index 0fb09c0..b86b7d9 100644
--- a/include/ndn-cpp/security/identity/memory-identity-storage.hpp
+++ b/include/ndn-cpp/security/identity/memory-identity-storage.hpp
@@ -49,15 +49,6 @@
revokeIdentity();
/**
- * Generate a name for a new key belonging to the identity.
- * @param identityName The identity name.
- * @param useKsk If true, generate a KSK name, otherwise a DSK name.
- * @return The generated key name.
- */
- virtual Name
- getNewKeyName(const Name& identityName, bool useKsk);
-
- /**
* Check if the specified key already exists.
* @param keyName The name of the key.
* @return true if the key exists, otherwise false.
@@ -66,13 +57,6 @@
doesKeyExist(const Name& keyName);
/**
- * Extract the key name from the certificate name.
- * @param certificateName The certificate name to be processed.
- */
- virtual Name
- getKeyNameForCertificate(const Name& certificateName);
-
- /**
* Add a public key to the identity storage.
* @param keyName The name of the public key to be added.
* @param keyType Type of the public key to be added.