diff options
| author | Steffan Karger | 2016-07-26 15:57:13 +0200 |
|---|---|---|
| committer | Gert Doering | 2016-07-26 16:55:37 +0200 |
| commit | d1c08ab1365096fdbd02cfb4f9ad97e759f13b82 (patch) | |
| tree | 7148a7e3263831615907b5ab17a0fbd372fcd082 | |
| parent | 13f3526a9b05bed63c50c93c5903b0cde0dcc7f4 (diff) | |
| download | openvpn-d1c08ab1365096fdbd02cfb4f9ad97e759f13b82.zip openvpn-d1c08ab1365096fdbd02cfb4f9ad97e759f13b82.tar.gz | |
Fix '--cipher none --cipher' crash
As reported in trac #699, OpenVPN crashes when an "--cipher none" option
is followed by "--cipher" (without arguments). Fix the crash, and print a
warning to indicate that using --cipher of --auth without an argument is
deprecated.
This is a (partly) backport of the patch I sent for the master branch
yesterday.
Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1469541433-1671-1-git-send-email-steffan.karger@fox-it.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/12107
Signed-off-by: Gert Doering <gert@greenie.muc.de>
| -rw-r--r-- | src/openvpn/options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index a49a4fb..1ef0299 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -6446,7 +6446,7 @@ add_option (struct options *options, else if (streq (p[0], "auth")) { VERIFY_PERMISSION (OPT_P_CRYPTO); - options->authname_defined = true; + msg (M_WARN, "WARNING: Using --auth without alg is deprecated."); } else if (streq (p[0], "cipher") && p[1]) { @@ -6462,7 +6462,7 @@ add_option (struct options *options, else if (streq (p[0], "cipher")) { VERIFY_PERMISSION (OPT_P_CRYPTO); - options->ciphername_defined = true; + msg (M_WARN, "WARNING: Using --cipher without alg is deprecated."); } else if (streq (p[0], "prng") && p[1]) { |