From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 15 Feb 2012 00:37:37 +0000 (-0800)
Subject: [1638] corrected toText() output of NSEC3PARAM with empty salt
X-Git-Tag: trac2351_base~247^2~9^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5fec871b80f8ef0bddc2e708235581bde00533f;p=thirdparty%2Fkea.git

[1638] corrected toText() output of NSEC3PARAM with empty salt
---

diff --git a/src/lib/dns/rdata/generic/nsec3param_51.cc b/src/lib/dns/rdata/generic/nsec3param_51.cc
index 6932254081..0d0eb9adda 100644
--- a/src/lib/dns/rdata/generic/nsec3param_51.cc
+++ b/src/lib/dns/rdata/generic/nsec3param_51.cc
@@ -145,9 +145,9 @@ string
 NSEC3PARAM::toText() const {
     using namespace boost;
     return (lexical_cast<string>(static_cast<int>(impl_->hashalg_)) +
-        " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
-        " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
-        " " + encodeHex(impl_->salt_));
+            " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
+            " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
+            " " + (impl_->salt_.empty() ? "-" : encodeHex(impl_->salt_)));
 }
 
 void
diff --git a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
index 2a2dc2a07f..0bbb5f251a 100644
--- a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
@@ -135,14 +135,6 @@ TYPED_TEST(NSEC3PARAMLikeTest, fromText) {
                                   this->getCommonText()).getSalt().size());
 }
 
-TYPED_TEST(NSEC3PARAMLikeTest, DISABLED_toText) {
-    // normal case
-    EXPECT_EQ(this->salt_txt, this->fromText(this->salt_txt).toText());
-
-    // empty salt case
-    EXPECT_EQ(this->nosalt_txt, this->fromText(this->nosalt_txt).toText());
-}
-
 TYPED_TEST(NSEC3PARAMLikeTest, badText) {
     // Bad salt hex
     EXPECT_THROW(this->fromText("1 1 1 SPORK0" + this->getCommonText()),
@@ -181,6 +173,14 @@ TYPED_TEST(NSEC3PARAMLikeTest, badText) {
                  InvalidRdataText);
 }
 
+TYPED_TEST(NSEC3PARAMLikeTest, toText) {
+    // normal case
+    EXPECT_EQ(this->salt_txt, this->fromText(this->salt_txt).toText());
+
+    // empty salt case
+    EXPECT_EQ(this->nosalt_txt, this->fromText(this->nosalt_txt).toText());
+}
+
 TYPED_TEST(NSEC3PARAMLikeTest, DISABLED_createFromWire) {
     // Normal case
     EXPECT_EQ(0, this->fromText(this->salt_txt).compare(