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

tests-integrated/security/test-validator-config.cpp

diff --git a/tests-integrated/security/test-validator-config.cpp b/tests-integrated/security/test-validator-config.cpp
index a192c6c..6a7ffd9 100644
--- a/tests-integrated/security/test-validator-config.cpp
+++ b/tests-integrated/security/test-validator-config.cpp
@@ -559,7 +559,7 @@
 
 
   Name sld("/TestValidatorConfig/HierarchicalChecker");
-  Name sldKeyName = keyChain.generateRSAKeyPairAsDefault(sld, true);
+  Name sldKeyName = keyChain.generateRsaKeyPairAsDefault(sld, true);
   shared_ptr<IdentityCertificate> sldCert =
     keyChain.prepareUnsignedIdentityCertificate(sldKeyName,
                                                 root,
@@ -570,7 +570,7 @@
   keyChain.addCertificateAsIdentityDefault(*sldCert);
 
   Name nld("/TestValidatorConfig/HierarchicalChecker/NextLevel");
-  Name nldKeyName = keyChain.generateRSAKeyPairAsDefault(nld, true);
+  Name nldKeyName = keyChain.generateRsaKeyPairAsDefault(nld, true);
   shared_ptr<IdentityCertificate> nldCert =
     keyChain.prepareUnsignedIdentityCertificate(nldKeyName,
                                                 sld,
@@ -764,7 +764,7 @@
 
 
   Name sld("/TestValidatorConfig/Nrd-1");
-  Name sldKeyName = keyChain.generateRSAKeyPairAsDefault(sld, true);
+  Name sldKeyName = keyChain.generateRsaKeyPairAsDefault(sld, true);
   shared_ptr<IdentityCertificate> sldCert =
     keyChain.prepareUnsignedIdentityCertificate(sldKeyName,
                                                 root,
@@ -775,7 +775,7 @@
   keyChain.addCertificateAsIdentityDefault(*sldCert);
 
   Name nld("/TestValidatorConfig/Nrd-1/Nrd-2");
-  Name nldKeyName = keyChain.generateRSAKeyPairAsDefault(nld, true);
+  Name nldKeyName = keyChain.generateRsaKeyPairAsDefault(nld, true);
   shared_ptr<IdentityCertificate> nldCert =
     keyChain.prepareUnsignedIdentityCertificate(nldKeyName,
                                                 sld,