Changeset 1788 for trunk/pdns/pdns/pdnssec.cc

Timestamp:

01/02/11 19:30:37 (2 years ago)

Author:

ahu

Message:

add import-zone-key for interop, remove key-repository setting from pdnssec

Files:

• trunk/pdns/pdns/pdnssec.cc (modified) (5 diffs)

trunk/pdns/pdns/pdnssec.cc

@@ -85 +85 @@
     ::arg().setSwitch("query-logging","Hint backends that queries should be logged")="no";
   ::arg().set("soa-minimum-ttl","Default SOA mininum ttl")="3600";    
-  ::arg().set("key-repository","")="./keys";
   UeberBackend::go();
 }
@@ -173 +172 @@
   desc.add_options()
     ("help,h", "produce help message")
-    ("key-repository,k", po::value<string>()->default_value("./keys"), "Location of keys")
     ("verbose,v", po::value<bool>(), "be verbose")
     ("force", "force an action")
@@ -197 +195 @@
   loadMainConfig();
   reportAllTypes();
-  DNSSECKeeper dk(g_vm["key-repository"].as<string>());
+  DNSSECKeeper dk;
 
   if(cmds[0] == "order-zone") {
@@ -258 +256 @@
   else if(cmds[0] == "add-zone-key") {
     const string& zone=cmds[1];
-    // need to get algorithm & ksk or zsk
+    // need to get algorithm & ksk or zsk from commandline
     dk.addKey(zone, 1, 5, 0); 
     cerr<<"Not implemented"<<endl;
@@ -326 +324 @@
     cout << dpk.d_key.convertToISC(dpk.d_algorithm) <<endl;
   }
+  else if(cmds[0]=="import-zone-key") {
+    cerr<<"This isn't quite right yet!"<<endl; /// XXX FIXME
+    string zone=cmds[1];
+    string fname=cmds[2];
+    DNSSECPrivateKey dpk;
+    getRSAKeyFromISC(&dpk.d_key.getContext(), fname.c_str());
+    dpk.d_algorithm = 5;
+    dpk.d_flags = 257;
+    dk.addKey(zone, true, dpk); // add a KSK
+  }
   else if(cmds[0]=="export-zone-dnskey") {
     string zone=cmds[1];