summaryrefslogtreecommitdiff
path: root/options.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-02-28 01:57:42 +0000
committerChristian Pointner <equinox@anytun.org>2008-02-28 01:57:42 +0000
commita742bbf8610aae58fc6d6ee2377c83395b3ca535 (patch)
treea8840f313844dc48225c3219f5e8e7f8aa0fabc6 /options.cpp
parentadded get Src/Dst Address @ plainPacket (diff)
fixed PlainPacket get Src/Dst Address
added toString to NetworkAddress
Diffstat (limited to 'options.cpp')
-rw-r--r--options.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/options.cpp b/options.cpp
index 7e5cac6..2a2b144 100644
--- a/options.cpp
+++ b/options.cpp
@@ -176,6 +176,9 @@ bool Options::parse(int argc, char* argv[])
if(cipher_ == "null")
kd_prf_ = "null";
+ if(cipher_ != "null" && kd_prf_ == "null")
+ kd_prf_ = "aes-ctr";
+
while(!host_port_queue.empty())
{
std::stringstream tmp_stream(host_port_queue.front());
@@ -237,7 +240,7 @@ void Options::printOptions()
std::cout << "cipher='" << cipher_ << "'" << std::endl;
std::cout << "key=" << key_.getHexDumpOneLine() << std::endl;
std::cout << "salt=" << salt_.getHexDumpOneLine() << std::endl;
- std::cout << "kd-prf='" << kd_prf_ << "'" << std::endl;
+ std::cout << "kd_prf='" << kd_prf_ << "'" << std::endl;
std::cout << "auth_algo='" << auth_algo_ << "'" << std::endl;
}