summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-03-03 18:23:29 +0000
committerChristian Pointner <equinox@anytun.org>2008-03-03 18:23:29 +0000
commit7e19b92adb937297987ac7f7b20f19c54f6cdd78 (patch)
treead3a2158a0d79e6b58daccf138c123315acda0ae
parentsome bugfixes (diff)
fixed param short code collision
-rw-r--r--anyctrOptions.cpp4
-rw-r--r--options.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/anyctrOptions.cpp b/anyctrOptions.cpp
index 3513857..54021d3 100644
--- a/anyctrOptions.cpp
+++ b/anyctrOptions.cpp
@@ -147,7 +147,7 @@ bool Options::parse(int argc, char* argv[])
PARSE_SCALAR_PARAM("-m","--mux", mux_)
PARSE_SCALAR_PARAM("-l","--prefix-len", network_prefix_length_)
PARSE_HEXSTRING_PARAM("-K","--key", key_)
- PARSE_HEXSTRING_PARAM("-a","--salt", salt_)
+ PARSE_HEXSTRING_PARAM("-A","--salt", salt_)
PARSE_SCALAR_PARAM("-k","--kd-prf", kd_prf_)
else
return false;
@@ -178,7 +178,7 @@ void Options::printUsage()
std::cout << " [-m|--mux] <mux-id> the multiplex id to use" << std::endl;
std::cout << " [-l|--prefix-len] <prefix length> network prefix length" << std::endl;
std::cout << " [-K|--key] <master key> master key to use for encryption" << std::endl;
- std::cout << " [-a|--salt] <master salt> master salt to use for encryption" << std::endl;
+ std::cout << " [-A|--salt] <master salt> master salt to use for encryption" << std::endl;
std::cout << " [-k|--kd-prf] <kd-prf type> key derivation pseudo random function" << std::endl;
}
diff --git a/options.cpp b/options.cpp
index 8e6040c..4aedd43 100644
--- a/options.cpp
+++ b/options.cpp
@@ -168,7 +168,7 @@ bool Options::parse(int argc, char* argv[])
PARSE_SCALAR_PARAM("-m","--mux", mux_)
PARSE_SCALAR_PARAM("-c","--cipher", cipher_)
PARSE_HEXSTRING_PARAM("-K","--key", key_)
- PARSE_HEXSTRING_PARAM("-a","--salt", salt_)
+ PARSE_HEXSTRING_PARAM("-A","--salt", salt_)
PARSE_SCALAR_PARAM("-k","--kd-prf", kd_prf_)
PARSE_SCALAR_PARAM("-a","--auth-algo", auth_algo_)
PARSE_CSLIST_PARAM("-M","--sync-hosts", host_port_queue)
@@ -218,7 +218,7 @@ void Options::printUsage()
std::cout << " [-m|--mux] <mux-id> the multiplex id to use" << std::endl;
std::cout << " [-c|--cipher] <cipher type> payload encryption algorithm" << std::endl;
std::cout << " [-K|--key] <master key> master key to use for encryption" << std::endl;
- std::cout << " [-a|--salt] <master salt> master salt to use for encryption" << std::endl;
+ std::cout << " [-A|--salt] <master salt> master salt to use for encryption" << std::endl;
std::cout << " [-k|--kd-prf] <kd-prf type> key derivation pseudo random function" << std::endl;
std::cout << " [-a|--auth-algo] <algo type> message authentication algorithm" << std::endl;
}