Changeset 1777

Timestamp:

12/30/10 22:45:44 (2 years ago)

Author:

ahu

Message:

fix up export-zone-key so that we set the algorithm field correctly

Location:

trunk/pdns/pdns

Files:

• dnsseckeeper.hh (modified) (1 diff)
• fsdnsseckeeper.cc (modified) (3 diffs)
• pdnssec.cc (modified) (1 diff)

trunk/pdns/pdns/dnsseckeeper.hh

@@ -68 +68 @@
 
   void create(unsigned int bits);
-  std::string convertToISC();
+  std::string convertToISC(unsigned int algorithm);
 
 private:

trunk/pdns/pdns/fsdnsseckeeper.cc

@@ -32 +32 @@
 }
 
-std::string RSAContext::convertToISC()
+std::string RSAContext::convertToISC(unsigned int algorithm)
 {
   string ret;
@@ -45 +45 @@
     ("Coefficient",&d_context.QP);
 
-  ret = "Private-key-format: v1.2\nAlgorithm: 5 (RSASHA1)\n";
+  ret = "Private-key-format: v1.2\nAlgorithm: "+lexical_cast<string>(algorithm)+" (RSASHA1)\n";
 
   BOOST_FOREACH(outputs_t::value_type value, outputs) {
@@ -121 +121 @@
   dpk.d_key.create(bits); // for testing, 1024
 
-  string isc = dpk.d_key.convertToISC();
+  string isc = dpk.d_key.convertToISC(algorithm);
   DNSKEYRecordContent drc = dpk.getDNSKEY();
   drc.d_flags = 256 + keyOrZone; // KSK

trunk/pdns/pdns/pdnssec.cc

@@ -325 +325 @@
     unsigned int id=atoi(cmds[2].c_str());
     DNSSECPrivateKey dpk=dk.getKeyById(zone, id);
-    cout << dpk.d_key.convertToISC() <<endl;
+    cout << dpk.d_key.convertToISC(dpk.d_algorithm) <<endl;
   }
   else if(cmds[0]=="export-zone-dnskey") {