commit f56c68f66b19444e82397db6f1c10604ecb1e6dd
author Yingdi Yu <yuyingdi@gmail.com> Thu Apr 24 21:50:13 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Apr 28 12:53:18 2014 -0700
tree 9751aad155575e6a88bd274a78a014c1f58fe5c9
parent 3e6a98e9dda1efe52e323476c92ffb96ceb5781b

security: Construct KeyChain from configuration file.

Change-Id: Iaddac24e2c4e199fdde83fa1d0067a87e18729c4
Refs: #1532

tools/ndnsec-dsk-gen.hpp

diff --git a/tools/ndnsec-dsk-gen.hpp b/tools/ndnsec-dsk-gen.hpp
index a36a85b..d99ea2b 100644
--- a/tools/ndnsec-dsk-gen.hpp
+++ b/tools/ndnsec-dsk-gen.hpp
@@ -104,7 +104,7 @@
     {
     case 'r':
       {
-        newKeyName = keyChain.generateRSAKeyPair(Name(identityName), false, keySize);
+        newKeyName = keyChain.generateRsaKeyPair(Name(identityName), false, keySize);
         if (0 == newKeyName.size())
           {
             std::cerr << "fail to generate key!" << std::endl;

tools/ndnsec-key-gen.hpp

diff --git a/tools/ndnsec-key-gen.hpp b/tools/ndnsec-key-gen.hpp
index 4781ddf..627af4b 100644
--- a/tools/ndnsec-key-gen.hpp
+++ b/tools/ndnsec-key-gen.hpp
@@ -79,7 +79,7 @@
 
         KeyChain keyChain;
 
-        Name keyName = keyChain.generateRSAKeyPair(Name(identityName), true, keySize);
+        Name keyName = keyChain.generateRsaKeyPair(Name(identityName), true, keySize);
 
         if (0 == keyName.size())
           return 1;

tools/ndnsec-set-acl.hpp

diff --git a/tools/ndnsec-set-acl.hpp b/tools/ndnsec-set-acl.hpp
index a7fc519..9721325 100644
--- a/tools/ndnsec-set-acl.hpp
+++ b/tools/ndnsec-set-acl.hpp
@@ -71,7 +71,7 @@
     }
 
   KeyChain keyChain;
-  keyChain.addAppToACL(keyName, KEY_CLASS_PRIVATE, appPath, ACL_TYPE_PRIVATE);
+  keyChain.addAppToAcl(keyName, KEY_CLASS_PRIVATE, appPath, ACL_TYPE_PRIVATE);
 
   return 0;
 }