From: Steffan Karger <steffan.karger@fox-it.com>
Date: Tue, 26 Jul 2016 13:57:13 +0000 (+0200)
Subject: Fix '--cipher none --cipher' crash
X-Git-Tag: v2.3.12~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c08ab1365096fdbd02cfb4f9ad97e759f13b82;p=thirdparty%2Fopenvpn.git

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>
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index a49a4fba9..1ef02993c 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])
     {