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

Timestamp:

01/25/11 08:51:55 (2 years ago)

Author:

ahu

Message:

'multi-algorithm support' - for now we still only do RSA, but the whole signer stuff has been abstracted out, and we could in theory add KnapsackCRC32 code!
Or of course ECDSA or GOST ;-)

Files:

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

trunk/pdns/pdns/pdnssec.cc

@@ -201 +201 @@
     BOOST_FOREACH(DNSSECKeeper::keyset_t::value_type value, keyset) {
       cout<<"ID = "<<value.second.id<<" ("<<(value.second.keyOrZone ? "KSK" : "ZSK")<<"), tag = "<<value.first.getDNSKEY().getTag();
-      cout<<", algo = "<<(int)value.first.d_algorithm<<", bits = "<<value.first.d_key.getConstContext().len*8<<"\tActive: "<<value.second.active<< endl; // humanTime(value.second.beginValidity)<<" - "<<humanTime(value.second.endValidity)<<endl;
+      cout<<", algo = "<<(int)value.first.d_algorithm<<", bits = "<<value.first.getKey()->getBits()<<"\tActive: "<<value.second.active<< endl; // humanTime(value.second.beginValidity)<<" - "<<humanTime(value.second.endValidity)<<endl;
       if(value.second.keyOrZone) {
         cout<<"KSK DNSKEY = "<<zone<<" IN DNSKEY "<< value.first.getDNSKEY().getZoneRepresentation() << endl;
@@ -414 +414 @@
     unsigned int id=atoi(cmds[2].c_str());
     DNSSECPrivateKey dpk=dk.getKeyById(zone, id);
-    cout << dpk.d_key.convertToISC(dpk.d_algorithm) <<endl;
+    cout << dpk.getKey()->convertToISC(dpk.d_algorithm) <<endl;
   }  
   else if(cmds[0]=="import-zone-key-pem") {
@@ -434 +434 @@
     B64Decode(interim, raw);
     DNSSECPrivateKey dpk;
-    getRSAKeyFromPEMString(&dpk.d_key.getContext(), raw);
+    DNSKEYRecordContent drc;
+    shared_ptr<DNSPrivateKey> key(DNSPrivateKey::fromPEMString(drc, raw));
+    dpk.setKey(key);
     
     dpk.d_algorithm = atoi(cmds[3].c_str());
@@ -467 +469 @@
     string fname=cmds[2];
     DNSSECPrivateKey dpk;
-    DNSKEYRecordContent drc = getRSAKeyFromISC(&dpk.d_key.getContext(), fname.c_str());
+    DNSKEYRecordContent drc;
+    shared_ptr<DNSPrivateKey> key(DNSPrivateKey::fromISCFile(drc, fname.c_str()));
+    dpk.setKey(key);
     dpk.d_algorithm = drc.d_algorithm;