upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-11 09:50:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Options parsing demands unnecessary configuration if PKCS11 is used

Browse source 
In the old patch the if incorrectly closed the outer if condition.
(closes ticket #231)

Trac-ticket: 231
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1350470774-12511-1-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/7095
Signed-off-by: David Sommerseth <davids@redhat.com>
This commit is contained in:
Arne Schwabe 2012-10-17 12:46:14 +02:00 committed by David Sommerseth
parent 2ebbe4c0b4
commit 70a07339f8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/openvpn/options.c
View file

@ -2192,13 +2192,15 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
}
else
#endif
#ifdef ENABLE_CRYPTOAPI
#ifdef MANAGMENT_EXTERNAL_KEY
if((options->management_flags & MF_EXTERNAL_KEY) && options->priv_key_file)
msg (M_USAGE, "--key and --management-external-key are mutually exclusive");
{
msg (M_USAGE, "--key and --management-external-key are mutually exclusive");
}
else
#endif
if (options->cryptoapi_cert)
#ifdef ENABLE_CRYPTOAPI
if (options->cryptoapi_cert)
{
if ((!(options->ca_file)) && (!(options->ca_path)))
msg(M_USAGE, "You must define CA file (--ca) or CA path (--capath)");