Changeset 650

Timestamp:

04/03/06 22:29:20 (4 years ago)

Author:

ahu

Message:

ok, I lied - rfc 4255 has chosen In All Its Wisdom to implement SSHFP as base-16 instead of base-64, like all the other crypto records. This is probably to make cutting & pasting from .ssh/known_hosts easier. Added support for hexadecimal records.

Location:

trunk/pdns/pdns

Files:

• dnsparser.cc (modified) (1 diff)
• dnsparser.hh (modified) (1 diff)
• dnsrecords.cc (modified) (2 diffs)
• dnswriter.cc (modified) (1 diff)
• dnswriter.hh (modified) (1 diff)
• rcpgenerator.cc (modified) (2 diffs)
• rcpgenerator.hh (modified) (2 diffs)

trunk/pdns/pdns/dnsparser.cc

@@ -391 +391 @@
   d_pos = d_startrecordpos + d_recordlen;
 }
+
+void PacketReader::xfrHexBlob(string& blob)
+{
+  xfrBlob(blob);
+}

trunk/pdns/pdns/dnsparser.hh

@@ -123 +123 @@
 
   void xfrBlob(string& blob);
+  void xfrHexBlob(string& blob);
 
   static uint16_t get16BitInt(const vector<unsigned char>&content, uint16_t& pos);

trunk/pdns/pdns/dnsrecords.cc

@@ -253 +253 @@
                  conv.xfr8BitInt(d_algorithm); 
                  conv.xfr8BitInt(d_fptype); 
-                 conv.xfrBlob(d_fingerprint);
+                 conv.xfrHexBlob(d_fingerprint);
                  )
 
@@ -297 +297 @@
    RRSIGRecordContent::report();
    DSRecordContent::report();
+   SSHFPRecordContent::report();
    NSECRecordContent::report();
    OPTRecordContent::report();

trunk/pdns/pdns/dnswriter.cc

@@ -163 +163 @@
 }
 
+void DNSPacketWriter::xfrHexBlob(const string& blob)
+{
+  xfrBlob(blob);
+}
+
+
 void DNSPacketWriter::getRecords(string& records)
 {

trunk/pdns/pdns/dnswriter.hh

@@ -84 +84 @@
   void xfrText(const string& text);
   void xfrBlob(const string& blob);
+  void xfrHexBlob(const string& blob);
 
   uint16_t d_pos;

trunk/pdns/pdns/rcpgenerator.cc

@@ -141 +141 @@
   B64Decode(tmp, val);
 }
+
+
+static inline uint8_t hextodec(uint8_t val)
+{
+  if(val >= '0' && val<='9')
+    return val-'0';
+  else if(val >= 'A' && val<='F')
+    return 10+(val-'A');
+  else if(val >= 'a' && val<='f')
+    return 10+(val-'a');
+  else
+    throw RecordTextException("Unknown hexadecimal character '"+lexical_cast<string>(val)+"'");
+}
+
+
+void HEXDecode(const char* begin, const char* end, string& val)
+{
+  if((end - begin)%2)
+    throw RecordTextException("Hexadecimal blob with odd number of characters");
+
+  int limit=(end-begin)/2;
+  val.resize(limit);
+  for(int n=0; n < limit; ++n) {
+    val[n] = hextodec(begin[2*n])*16 + hextodec(begin[2*n+1]); 
+  }
+}
+
+void RecordTextReader::xfrHexBlob(string& val)
+{
+  skipSpaces();
+  int pos=d_pos;
+  while(d_pos < d_end && !dns_isspace(d_string[d_pos]))
+    d_pos++;
+
+  HEXDecode(d_string.c_str()+pos, d_string.c_str() + d_pos, val);
+}
+
 
 void RecordTextReader::xfrText(string& val)
@@ -280 +317 @@
 }
 
+void RecordTextWriter::xfrHexBlob(const string& val)
+{
+  if(!d_string.empty())
+    d_string.append(1,' ');
+
+  string::size_type limit=val.size();
+  char tmp[5];
+  for(string::size_type n = 0; n < limit; ++n) {
+    snprintf(tmp, sizeof(tmp)-1, "%02x", (unsigned char)val[n]);
+    d_string+=tmp;
+  }
+}
+
 void RecordTextWriter::xfrText(const string& val)
 {

trunk/pdns/pdns/rcpgenerator.hh

@@ -48 +48 @@
   void xfrLabel(string& val, bool compress=false);
   void xfrText(string& val);
+  void xfrHexBlob(string& val);
   void xfrBlob(string& val);
 
@@ -73 +74 @@
   void xfrText(const string& val);
   void xfrBlob(const string& val);
+  void xfrHexBlob(const string& val);
 
 private: