commit 0aa47bf4bf9f786dff24663cb31f988fab4882b4
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jul 30 10:55:36 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jul 30 10:55:36 2013 -0700
tree 128cedd7df9ea6a9f2d3deecea31cd4b6bed137b
parent b4bf3ef1ed764211bf3f5ece7955f7cbff4fa516

model-wire: Adding partial compliance to CCNb format in Signature block

Now digest algorithm is specified as NOP and SignatureBits are padded to
16 bits

Refs #1021 (http://redmine.named-data.net/issues/1021)

model/wire/ccnb/wire-ccnb-data.cc

diff --git a/model/wire/ccnb/wire-ccnb-data.cc b/model/wire/ccnb/wire-ccnb-data.cc
index e625e06..fb87899 100644
--- a/model/wire/ccnb/wire-ccnb-data.cc
+++ b/model/wire/ccnb/wire-ccnb-data.cc
@@ -190,7 +190,8 @@
   //   {
   //     Ccnb::AppendString (start, CcnbParser::CCN_DTAG_DigestAlgorithm, GetSignature ().GetDigestAlgorithm ());
   //   }
-  Ccnb::AppendTaggedBlob (start, CcnbParser::CCN_DTAG_SignatureBits, m_data->GetSignature ()); // <SignatureBits />
+  Ccnb::AppendString (start, CcnbParser::CCN_DTAG_DigestAlgorithm, "NOP");
+  Ccnb::AppendTaggedBlobWithPadding (start, CcnbParser::CCN_DTAG_SignatureBits, 16, m_data->GetSignature ()); // <SignatureBits />
   Ccnb::AppendCloser (start);                                    // </Signature>
 
   Ccnb::AppendBlockHeader (start, CcnbParser::CCN_DTAG_Name, CcnbParser::CCN_DTAG);    // <Name>
@@ -269,8 +270,10 @@
   //   {
   //     written += Ccnb::EstimateString (CcnbParser::CCN_DTAG_DigestAlgorithm, GetSignature ().GetDigestAlgorithm ());
   //   }
-  written += Ccnb::EstimateTaggedBlob (CcnbParser::CCN_DTAG_SignatureBits,
-                                       sizeof (m_data->GetSignature ()));      // <SignatureBits />
+  written += Ccnb::EstimateString (CcnbParser::CCN_DTAG_DigestAlgorithm, "NOP");
+  // "signature" will be always padded to 16 octets
+  written += Ccnb::EstimateTaggedBlob (CcnbParser::CCN_DTAG_SignatureBits, 16);      // <SignatureBits />
+  // written += Ccnb::EstimateTaggedBlob (CcnbParser::CCN_DTAG_SignatureBits, sizeof (m_data->GetSignature ()));      // <SignatureBits />
   written += 1;                                    // </Signature>
 
   written += Ccnb::EstimateBlockHeader (CcnbParser::CCN_DTAG_Name);    // <Name>