security: Fixing decoding/encoding certificates. Now the test is fully working
Change-Id: Ieaecba4576d1af3abc68e48baa87e8d4d312b702
diff --git a/include/ndn-cpp/encoding/oid.hpp b/include/ndn-cpp/encoding/oid.hpp
index f89339c..e755c05 100644
--- a/include/ndn-cpp/encoding/oid.hpp
+++ b/include/ndn-cpp/encoding/oid.hpp
@@ -22,6 +22,8 @@
{
}
+ OID(const char *oid);
+
OID(const std::string& oid);
OID(const std::vector<int>& oid)
@@ -58,10 +60,16 @@
void
decode(CryptoPP::BufferedTransformation &in);
-
-private:
- bool equal(const OID& oid) const;
+
+private:
+ void
+ construct(const std::string &value);
+
+ bool
+ equal(const OID& oid) const;
+
+private:
std::vector<int> oid_;
};
diff --git a/include/ndn-cpp/security/certificate/certificate-extension.hpp b/include/ndn-cpp/security/certificate/certificate-extension.hpp
index 697993c..d979d44 100644
--- a/include/ndn-cpp/security/certificate/certificate-extension.hpp
+++ b/include/ndn-cpp/security/certificate/certificate-extension.hpp
@@ -27,17 +27,6 @@
{
decode(in);
}
-
- /**
- * Create a new CertificateExtension.
- * @param oid The oid of subject description entry.
- * @param isCritical If true, the extension must be handled.
- * @param value The extension value.
- */
- CertificateExtension(const std::string& oid, const bool isCritical, const Buffer& value)
- : extensionId_(oid), isCritical_(isCritical), extensionValue_(value)
- {
- }
/**
* Create a new CertificateExtension.
@@ -46,10 +35,15 @@
* @param value The extension value.
*/
CertificateExtension(const OID& oid, const bool isCritical, const Buffer& value)
- : extensionId_(oid), isCritical_(isCritical), extensionValue_(value)
+ : extensionId_(oid), isCritical_(isCritical), extensionValue_(value)
{
}
+ CertificateExtension(const OID& oid, const bool isCritical, const uint8_t* value, size_t valueSize)
+ : extensionId_(oid), isCritical_(isCritical), extensionValue_(value, valueSize)
+ {
+ }
+
/**
* The virtual destructor.
*/
diff --git a/include/ndn-cpp/security/certificate/certificate-subject-description.hpp b/include/ndn-cpp/security/certificate/certificate-subject-description.hpp
index 9576e0d..5717920 100644
--- a/include/ndn-cpp/security/certificate/certificate-subject-description.hpp
+++ b/include/ndn-cpp/security/certificate/certificate-subject-description.hpp
@@ -31,16 +31,6 @@
* @param oid The oid of the subject description entry.
* @param value The value of the subject description entry.
*/
- CertificateSubjectDescription(const std::string &oid, const std::string &value)
- : oid_(oid), value_(value)
- {
- }
-
- /**
- * Create a new CertificateSubjectDescription.
- * @param oid The oid of the subject description entry.
- * @param value The value of the subject description entry.
- */
CertificateSubjectDescription(const OID &oid, const std::string &value)
: oid_(oid), value_(value)
{
diff --git a/src/encoding/cryptopp/asn_ext.cpp b/src/encoding/cryptopp/asn_ext.cpp
index 6698426..a1ee39d 100644
--- a/src/encoding/cryptopp/asn_ext.cpp
+++ b/src/encoding/cryptopp/asn_ext.cpp
@@ -16,6 +16,8 @@
#include <sys/time.h>
#endif
+#include "../../util/time.hpp"
+
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
@@ -26,10 +28,6 @@
size_t
DEREncodeGeneralTime(CryptoPP::BufferedTransformation &bt, MillisecondsSince1970 time)
{
-#ifndef NDN_CPP_HAVE_GMTIME_SUPPORT
- throw Asn::Error("Time functions are not supported by the standard library");
-#endif
-
if (time < 0)
throw Asn::Error("Calendar time value out of range");
else if (time > 2e14)
@@ -39,14 +37,13 @@
time_t secondsSince1970 = time / 1000;
struct tm* gmt = gmtime(&secondsSince1970);
- std::string asn1time ((boost::format("%04d%02d%02d%02d%02d%02d%sZ")
+ std::string asn1time ((boost::format("%04d%02d%02d%02d%02d%02dZ")
% (1900 + gmt->tm_year)
% (gmt->tm_mon + 1)
% gmt->tm_mday
% gmt->tm_hour
% gmt->tm_min
% gmt->tm_sec).str());
- // = os.str();
bt.Put(GENERALIZED_TIME);
size_t lengthBytes = DERLengthEncode(bt, asn1time.size());
@@ -69,39 +66,17 @@
if (bc != bt.Get(time_str, bc))
BERDecodeError();
- std::vector<std::string> params;
- std::string current;
- std::locale cLocale("C");
+ std::string str;
+ str.assign (time_str.begin(), time_str.end());
- for(uint32_t j = 0; j != time_str.size(); ++j)
- {
- if(std::isdigit(reinterpret_cast<char&>(time_str[j]), cLocale))
- current += time_str[j];
- else
- {
- if(current != "")
- params.push_back(current);
- current.clear();
- }
- }
- if(current != "")
- params.push_back(current);
-
- if(params.size() < 3 || params.size() > 6)
- throw Asn::Error("Invalid time specification " + std::string(time_str.begin(), time_str.end()));
-
- struct tm gmt;
- gmt.tm_year = boost::lexical_cast<int>(params[0]);
- gmt.tm_mon = boost::lexical_cast<int>(params[1]) - 1;
- gmt.tm_mday = boost::lexical_cast<int>(params[2]);
- gmt.tm_hour = (params.size() >= 4) ? boost::lexical_cast<int>(params[3]) : 0;
- gmt.tm_min = (params.size() >= 5) ? boost::lexical_cast<int>(params[4]) : 0;
- gmt.tm_sec = (params.size() == 6) ? boost::lexical_cast<int>(params[5]) : 0;
-
- if (b == GENERALIZED_TIME)
- gmt.tm_year -= 1900;
-
- time = timegm(&gmt) * 1000;
+ if (b == UTC_TIME) {
+ if (boost::lexical_cast<int>(str.substr(0,2)) < 50)
+ str = "20" + str;
+ else
+ str = "19" + str;
+ }
+
+ time = fromIsoString(str.substr(0, 8) + "T" + str.substr(8, 6));
}
} // namespace ndn
diff --git a/src/encoding/oid.cpp b/src/encoding/oid.cpp
index 2db72f7..0fb6697 100644
--- a/src/encoding/oid.cpp
+++ b/src/encoding/oid.cpp
@@ -16,8 +16,19 @@
namespace ndn {
+OID::OID(const char *oid)
+{
+ construct(oid);
+}
+
OID::OID(const string& oid)
{
+ construct(oid);
+}
+
+void
+OID::construct(const std::string &oid)
+{
string str = oid + ".";
size_t pos = 0;
diff --git a/src/security/certificate/certificate.cpp b/src/security/certificate/certificate.cpp
index da88444..7a70cdc 100644
--- a/src/security/certificate/certificate.cpp
+++ b/src/security/certificate/certificate.cpp
@@ -250,7 +250,7 @@
void
Certificate::printCertificate(std::ostream &os) const
{
- os << "Certificate name: " << endl;
+ os << "Certificate name:" << endl;
os << " " << getName() << endl;
os << "Validity:" << endl;
{
@@ -265,7 +265,7 @@
os << " " << it->getOidString() << ": " << it->getValue() << endl;
}
- os << "Public key bits: " << endl;
+ os << "Public key bits:" << endl;
CryptoPP::Base64Encoder encoder(new CryptoPP::FileSink(os), true, 64);
key_.encode(encoder);
diff --git a/tests_boost/test-encode-decode-certificate.cpp b/tests_boost/test-encode-decode-certificate.cpp
index 41405c0..4743c95 100644
--- a/tests_boost/test-encode-decode-certificate.cpp
+++ b/tests_boost/test-encode-decode-certificate.cpp
@@ -14,6 +14,7 @@
#include <cryptopp/files.h>
#include <fstream>
+#include <boost/test/output_test_stream.hpp>
using namespace std;
using namespace ndn;
@@ -71,57 +72,108 @@
0x8c, 0xc8, 0x9a, 0xdf, 0xef, 0xed, 0x35, 0xe7, 0x7a, 0x62, 0xea, 0x76, 0x7c, 0xbb, 0x08, 0x26, 0xc7, 0x02, 0x01, 0x11
};
-const uint8_t T[] = {
-0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xac, 0x72, 0x2e, 0x1e, 0x18, 0xea, 0x25, 0x9b, 0x32, 0xea, 0xee, 0xa8, 0x15, 0x04, 0xba, 0xdf, 0x9c, 0x24, 0xb3, 0xde, 0x56, 0x17, 0xf1, 0xee, 0x99, 0xba, 0x34, 0x01, 0x08, 0x6f, 0x6c, 0xb5, 0x56, 0x30, 0xbf, 0x90, 0xa9, 0x36, 0xaa, 0xd1, 0x10, 0x8b, 0x9a, 0x30, 0xfb, 0x35, 0x38, 0x21, 0x42, 0x70, 0xed, 0xe6, 0x33, 0x9c, 0xfa, 0x50, 0x6d, 0x85, 0x96, 0x60, 0x7e, 0x5b, 0xa9, 0x81, 0xb3, 0x24, 0xb7, 0xe9, 0xfc, 0xaf, 0xb5, 0xf7, 0x81, 0x7c, 0x19, 0xf1, 0xb6, 0x24, 0xbd, 0x05, 0xeb, 0x4a, 0x11, 0x68, 0xd7, 0xae, 0xc4, 0x13, 0x70, 0x7c, 0x85, 0x13, 0x78, 0x61, 0x2a, 0xf8, 0xa6, 0xa3, 0x0a, 0x33, 0x4a, 0x7d, 0xb1, 0xd9, 0x07, 0x3b, 0x01, 0x02, 0xd4, 0x50, 0x0b, 0x02, 0xfc, 0xcd, 0x7e, 0xe6, 0x5a, 0xcf, 0x72, 0x74, 0xd7, 0x96, 0xc1, 0x28, 0xbb, 0xcd, 0x1c, 0xc9, 0x38, 0xd8, 0x77, 0x23, 0x6f, 0x98, 0xdc, 0x98, 0x3d, 0xde, 0x15, 0x5e, 0x43, 0xb5, 0x80, 0xa7, 0xca, 0xdb, 0xec, 0xc5, 0xc3, 0x0d, 0x15, 0xa6, 0x45, 0x81, 0x91, 0xd2, 0x8c, 0x4a, 0xc0, 0xab, 0x46, 0x64, 0xfc, 0xfb, 0x67, 0x4c, 0x02, 0x88, 0x6f, 0x06, 0xfc, 0xb1, 0x3c, 0x3a, 0x24, 0x67, 0xcf, 0x5b, 0x74, 0x71, 0x6e, 0xcf, 0x9b, 0x88, 0xca, 0xe6, 0xb6, 0x9e, 0xf7, 0x1a, 0x9a, 0xd8, 0x36, 0x3c, 0xf2, 0x26, 0x06, 0x15, 0x86, 0x9b, 0xc9, 0x04, 0xa6, 0x99, 0xc2, 0xf2, 0xbf, 0xbc, 0xb2, 0xe0, 0x4e, 0xa8, 0x46, 0xc5, 0x8c, 0x06, 0xff, 0x82, 0x1f, 0xfc, 0xff, 0xfc, 0xab, 0x88, 0x6e, 0xfe, 0x8e, 0x39, 0xa6, 0xe4, 0xfa, 0x46, 0x5b, 0x11, 0xc2, 0x7c, 0x9d, 0xb4, 0x73, 0xe3, 0x04, 0x64, 0xd6, 0xd4, 0x38, 0x84, 0xef, 0x68, 0x2b, 0x93, 0x24, 0x4c, 0x62, 0x84, 0x41, 0x15, 0x02, 0x03, 0x01, 0x00, 0x01
+const uint8_t CERT[] = {
+0x30, 0x81, 0xff, 0x30, 0x22, 0x18, 0x0f, 0x32, 0x30, 0x31, 0x33, 0x31, 0x32, 0x32, 0x36, 0x32, 0x33, 0x32, 0x32, 0x35, 0x34, 0x5a, 0x18, 0x0f, 0x32, 0x30, 0x31, 0x33, 0x31, 0x32, 0x32, 0x36, 0x32, 0x33, 0x32, 0x32, 0x35, 0x34, 0x5a, 0x30, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x29, 0x13, 0x09, 0x54, 0x45, 0x53, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x30, 0x81, 0x9d, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x81, 0x8b, 0x00, 0x30, 0x81, 0x87, 0x02, 0x81, 0x81, 0x00, 0x9e, 0x06, 0x3e, 0x47, 0x85, 0xb2, 0x34, 0x37, 0xaa, 0x85, 0x47, 0xac, 0x03, 0x24, 0x83, 0xb5, 0x9c, 0xa8, 0x05, 0x3a, 0x24, 0x1e, 0xeb, 0x89, 0x01, 0xbb, 0xe9, 0x9b, 0xb2, 0xc3, 0x22, 0xac, 0x68, 0xe3, 0xf0, 0x6c, 0x02, 0xce, 0x68, 0xa6, 0xc4, 0xd0, 0xa7, 0x06, 0x90, 0x9c, 0xaa, 0x1b, 0x08, 0x1d, 0x8b, 0x43, 0x9a, 0x33, 0x67, 0x44, 0x6d, 0x21, 0xa3, 0x1b, 0x88, 0x9a, 0x97, 0x5e, 0x59, 0xc4, 0x15, 0x0b, 0xd9, 0x2c, 0xbd, 0x51, 0x07, 0x61, 0x82, 0xad, 0xc1, 0xb8, 0xd7, 0xbf, 0x9b, 0xcf, 0x7d, 0x24, 0xc2, 0x63, 0xf3, 0x97, 0x17, 0xeb, 0xfe, 0x62, 0x25, 0xba, 0x5b, 0x4d, 0x8a, 0xc2, 0x7a, 0xbd, 0x43, 0x8a, 0x8f, 0xb8, 0xf2, 0xf1, 0xc5, 0x6a, 0x30, 0xd3, 0x50, 0x8c, 0xc8, 0x9a, 0xdf, 0xef, 0xed, 0x35, 0xe7, 0x7a, 0x62, 0xea, 0x76, 0x7c, 0xbb, 0x08, 0x26, 0xc7, 0x02, 0x01, 0x11, 0x30, 0x25, 0x30, 0x23, 0x06, 0x06, 0x2b, 0x06, 0x01, 0x05, 0x20, 0x01, 0x01, 0x01, 0xff, 0x04, 0x16, 0x30, 0x14, 0x04, 0x0c, 0x2f, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2f, 0x6b, 0x69, 0x74, 0x74, 0x79, 0x02, 0x01, 0x00, 0x02, 0x01, 0x0a
};
+const std::string CERT_INFO = "Certificate name:\n"
+ " /\n"
+ "Validity:\n"
+ " NotBefore: 20131226T232254.000000\n"
+ " NotAfter: 20131226T232254.000000\n"
+ "Subject Description:\n"
+ " 2.5.4.41: TEST NAME\n"
+ "Public key bits:\n"
+ "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCeBj5HhbI0N6qFR6wDJIO1nKgF\n"
+ "OiQe64kBu+mbssMirGjj8GwCzmimxNCnBpCcqhsIHYtDmjNnRG0hoxuImpdeWcQV\n"
+ "C9ksvVEHYYKtwbjXv5vPfSTCY/OXF+v+YiW6W02Kwnq9Q4qPuPLxxWow01CMyJrf\n"
+ "7+0153pi6nZ8uwgmxwIB\n";
+
BOOST_AUTO_TEST_CASE (Encode)
{
ndn::Certificate c;
+ // validity
c.setNotBefore(1388100174000); // 12/26/2013 @ 11:22pm
c.setNotAfter(1388100174000); // 12/26/2013 @ 11:22pm
- // RSA::PrivateKey privateKey_;
- // StringSource source(DEFAULT_PRIVATE_KEY_DER, sizeof(DEFAULT_PRIVATE_KEY_DER), true);
- // privateKey_.Load(source);
-
- // RSA::PublicKey publicKey_(privateKey_);
- // std::string x;
- // CryptoPP::StringSink sink(x);
- // publicKey_.Save(sink);
+ // subject
+ c.addSubjectDescription(CertificateSubjectDescription("2.5.4.41", "TEST NAME"));
- // std::ofstream of("pubkey.key");
- // of.write(x.c_str(), x.size());
-
+ // publicKeyInfo
ndn::PublicKey key(PUBLIC_KEY, sizeof(PUBLIC_KEY));
- CryptoPP::FileSink sink("pub2.key");
- key.encode(sink);
+ c.setPublicKeyInfo(key);
+ // extensions
+ BOOST_REQUIRE_NO_THROW({
+ std::string extenstionValue;
+ StringSink sink(extenstionValue);
+ DERSequenceEncoder seq(sink);
+ {
+ std::string name("/hello/kitty");
+ DEREncodeOctetString(seq, reinterpret_cast<const uint8_t*>(name.c_str()), name.size());
+ // trustClass
+ DEREncodeUnsigned<uint32_t>(seq, 0);
+ // trustLevel
+ DEREncodeUnsigned<uint32_t>(seq, 10);
+ }
+ seq.MessageEnd();
+
+ c.addExtension(CertificateExtension("1.3.6.1.5.32.1", true,
+ reinterpret_cast<const uint8_t*>(extenstionValue.c_str()), extenstionValue.size()));
+ });
// RSA::PublicKey p;
// StringSource source(T, sizeof(T), true);
// p.Load(source);
+
+ BOOST_REQUIRE_NO_THROW(c.encode());
+
+ // ofstream of("cert.out");
+ // of.write((const char*)c.getContent().value(), c.getContent().value_size());
// const Block &wire = i.wireEncode();
- // BOOST_CHECK_EQUAL_COLLECTIONS(Interest1, Interest1+sizeof(Interest1),
- // wire.begin(), wire.end());
+ BOOST_REQUIRE_EQUAL_COLLECTIONS(CERT, CERT+sizeof(CERT),
+ c.getContent().value_begin(), c.getContent().value_end());
+
+ std::ostringstream os;
+ os << c << std::endl;
+ std::string info(os.str());
+ BOOST_REQUIRE_EQUAL_COLLECTIONS(CERT_INFO.begin(), CERT_INFO.end(),
+ info.begin(), info.end());
}
-// BOOST_AUTO_TEST_CASE (Decode)
-// {
-// Block interestBlock(Interest1, sizeof(Interest1));
-
-// ndn::Interest i;
-// BOOST_CHECK_NO_THROW(i.wireDecode(interestBlock));
+const unsigned char REAL_CERT[] = {
+0x30, 0x82, 0x01, 0x63, 0x30, 0x22, 0x18, 0x0f, 0x32, 0x30, 0x31, 0x33, 0x31, 0x31, 0x30, 0x31, 0x31, 0x37, 0x31, 0x31, 0x32, 0x32, 0x5a, 0x18, 0x0f, 0x32, 0x30, 0x31, 0x34, 0x31, 0x31, 0x30, 0x31, 0x31, 0x37, 0x31, 0x31, 0x32, 0x32, 0x5a, 0x30, 0x19, 0x30, 0x17, 0x06, 0x03, 0x55, 0x04, 0x29, 0x13, 0x10, 0x4e, 0x44, 0x4e, 0x20, 0x54, 0x65, 0x73, 0x74, 0x62, 0x65, 0x64, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x30, 0x82, 0x01, 0x20, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0d, 0x00, 0x30, 0x82, 0x01, 0x08, 0x02, 0x82, 0x01, 0x01, 0x00, 0xd3, 0xac, 0x7e, 0x7a, 0x5c, 0x33, 0x58, 0x21, 0xda, 0xe0, 0x8d, 0xdb, 0xca, 0xb6, 0x02, 0x30, 0x02, 0x15, 0xc5, 0x0a, 0x51, 0x54, 0xbb, 0x8e, 0x5e, 0x9d, 0x21, 0xf8, 0x14, 0xbe, 0xe4, 0x63, 0x60, 0x31, 0x53, 0xe2, 0xef, 0xee, 0x34, 0xa3, 0x8c, 0xd2, 0x24, 0x6f, 0xa4, 0x89, 0x4f, 0x02, 0x20, 0x7d, 0x66, 0xb6, 0x3f, 0x11, 0x40, 0x0c, 0xc1, 0x5f, 0xd8, 0x45, 0x23, 0x95, 0x40, 0xc8, 0xe0, 0xbc, 0x9d, 0x2f, 0x03, 0xf1, 0x83, 0x9f, 0x07, 0x0b, 0x76, 0xc9, 0x10, 0xd9, 0x3e, 0x0b, 0x75, 0x13, 0x93, 0xe9, 0xc9, 0x85, 0x01, 0x88, 0x36, 0x2e, 0xab, 0xfc, 0xe6, 0x24, 0x32, 0xfc, 0xc6, 0x3c, 0x40, 0x97, 0x1a, 0xcc, 0xcd, 0x53, 0xaa, 0x0f, 0xfb, 0xa3, 0xfe, 0xf9, 0x24, 0x70, 0x13, 0x3f, 0x4f, 0x5b, 0x7d, 0x43, 0xaa, 0x75, 0x0a, 0x94, 0x72, 0xab, 0xe1, 0x8c, 0x45, 0xb5, 0x78, 0x10, 0x01, 0xef, 0x1f, 0xb3, 0x05, 0x6f, 0xa6, 0xc3, 0xac, 0x7f, 0x6d, 0xf0, 0x31, 0xc4, 0x83, 0xb3, 0x4f, 0x50, 0x26, 0x92, 0x40, 0x1a, 0xdd, 0xec, 0xfb, 0xcb, 0xef, 0x63, 0xfe, 0x41, 0xd8, 0x8d, 0x1f, 0xdc, 0xec, 0xfc, 0x48, 0x95, 0xcc, 0x09, 0x1e, 0x30, 0x6e, 0x22, 0x9e, 0x24, 0x97, 0x2e, 0xe6, 0x0c, 0xdf, 0x3d, 0x20, 0x32, 0xaa, 0x9c, 0xc9, 0x45, 0x14, 0xaf, 0xaa, 0xf5, 0x17, 0xd2, 0x01, 0x98, 0x33, 0xbe, 0x2a, 0x9f, 0x7b, 0x9d, 0x98, 0x7c, 0x54, 0x22, 0xfe, 0x72, 0x72, 0x04, 0xc3, 0x2c, 0xc0, 0x14, 0x0b, 0xa9, 0x40, 0x7e, 0x46, 0xa1, 0x75, 0x16, 0x1a, 0x27, 0x9e, 0xf2, 0x82, 0x96, 0xc0, 0x7d, 0xaf, 0x18, 0x75, 0xfb, 0xbb, 0xab, 0x16, 0x66, 0xc0, 0xa9, 0xd7, 0x93, 0x4c, 0x48, 0x6d, 0xce, 0x0b, 0x88, 0xd4, 0x21, 0x93, 0x84, 0x89, 0x55, 0x05, 0xd5, 0x02, 0x01, 0x11
+};
-// BOOST_CHECK_EQUAL(i.getName().toUri(), "/local/ndn/prefix");
-// BOOST_CHECK_EQUAL(i.getScope(), 1);
-// BOOST_CHECK_EQUAL(i.getInterestLifetime(), 1000);
-// BOOST_CHECK_EQUAL(i.getMinSuffixComponents(), 1);
-// BOOST_CHECK_EQUAL(i.getMaxSuffixComponents(), 1);
-// BOOST_CHECK_EQUAL(i.getChildSelector(), 1);
-// BOOST_CHECK_EQUAL(i.getMustBeFresh(), false);
-// BOOST_CHECK_EQUAL(i.getExclude().toUri(), "alex,xxxx,*,yyyy");
-// }
+const std::string REAL_CERT_INFO = "Certificate name:\n"
+" /tmp\n"
+"Validity:\n"
+" NotBefore: 20131101T171122.000000\n"
+" NotAfter: 20141101T171122.000000\n"
+"Subject Description:\n"
+" 2.5.4.41: NDN Testbed Root\n"
+"Public key bits:\n"
+"MIIBIDANBgkqhkiG9w0BAQEFAAOCAQ0AMIIBCAKCAQEA06x+elwzWCHa4I3byrYC\n"
+"MAIVxQpRVLuOXp0h+BS+5GNgMVPi7+40o4zSJG+kiU8CIH1mtj8RQAzBX9hFI5VA\n"
+"yOC8nS8D8YOfBwt2yRDZPgt1E5PpyYUBiDYuq/zmJDL8xjxAlxrMzVOqD/uj/vkk\n"
+"cBM/T1t9Q6p1CpRyq+GMRbV4EAHvH7MFb6bDrH9t8DHEg7NPUCaSQBrd7PvL72P+\n"
+"QdiNH9zs/EiVzAkeMG4iniSXLuYM3z0gMqqcyUUUr6r1F9IBmDO+Kp97nZh8VCL+\n"
+"cnIEwyzAFAupQH5GoXUWGiee8oKWwH2vGHX7u6sWZsCp15NMSG3OC4jUIZOEiVUF\n"
+"1QIB\n";
+
+BOOST_AUTO_TEST_CASE (Decode)
+{
+ ndn::Data d("/tmp");
+ d.setContent(REAL_CERT, sizeof(REAL_CERT));
+
+ ndn::Certificate c(d);
+
+ std::ostringstream os;
+ os << c << std::endl;
+ std::string info(os.str());
+ BOOST_REQUIRE_EQUAL_COLLECTIONS(REAL_CERT_INFO.begin(), REAL_CERT_INFO.end(),
+ info.begin(), info.end());
+}
BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests_boost/test-encode-decode-interest.cpp b/tests_boost/test-encode-decode-interest.cpp
index 0b21847..ddfe03a 100644
--- a/tests_boost/test-encode-decode-interest.cpp
+++ b/tests_boost/test-encode-decode-interest.cpp
@@ -38,16 +38,16 @@
Block interestBlock(Interest1, sizeof(Interest1));
ndn::Interest i;
- BOOST_CHECK_NO_THROW(i.wireDecode(interestBlock));
+ BOOST_REQUIRE_NO_THROW(i.wireDecode(interestBlock));
- BOOST_CHECK_EQUAL(i.getName().toUri(), "/local/ndn/prefix");
- BOOST_CHECK_EQUAL(i.getScope(), 1);
- BOOST_CHECK_EQUAL(i.getInterestLifetime(), 1000);
- BOOST_CHECK_EQUAL(i.getMinSuffixComponents(), 1);
- BOOST_CHECK_EQUAL(i.getMaxSuffixComponents(), 1);
- BOOST_CHECK_EQUAL(i.getChildSelector(), 1);
- BOOST_CHECK_EQUAL(i.getMustBeFresh(), false);
- BOOST_CHECK_EQUAL(i.getExclude().toUri(), "alex,xxxx,*,yyyy");
+ BOOST_REQUIRE_EQUAL(i.getName().toUri(), "/local/ndn/prefix");
+ BOOST_REQUIRE_EQUAL(i.getScope(), 1);
+ BOOST_REQUIRE_EQUAL(i.getInterestLifetime(), 1000);
+ BOOST_REQUIRE_EQUAL(i.getMinSuffixComponents(), 1);
+ BOOST_REQUIRE_EQUAL(i.getMaxSuffixComponents(), 1);
+ BOOST_REQUIRE_EQUAL(i.getChildSelector(), 1);
+ BOOST_REQUIRE_EQUAL(i.getMustBeFresh(), false);
+ BOOST_REQUIRE_EQUAL(i.getExclude().toUri(), "alex,xxxx,*,yyyy");
}
BOOST_AUTO_TEST_CASE (Encode)
@@ -62,7 +62,7 @@
i.getExclude().excludeOne("alex").excludeRange("xxxx", "yyyy");
const Block &wire = i.wireEncode();
- BOOST_CHECK_EQUAL_COLLECTIONS(Interest1, Interest1+sizeof(Interest1),
+ BOOST_REQUIRE_EQUAL_COLLECTIONS(Interest1, Interest1+sizeof(Interest1),
wire.begin(), wire.end());
}