Options parsing demands unnecessary configuration if PKCS11 is used
PATCH 1/1 Options parsing demands unnecessary configuration if PKCS11 is used
In the old patch the if incorrectly closed the outer if condition. (closes ticket #231)
--- src/openvpn/options.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
src/openvpn/options.c +6 -4
@@ -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)" );
Signature · 1 line
1.7.9.5
Quoted 5 lines · Arne Schwabe
In the old patch the if incorrectly closed the outer if condition. (closes ticket #231)
--- src/openvpn/options.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
ACK. Applied to master and beta/2.3 branches.
commit 70a07339f8d323d69cdcf8d59da1f331d39e4d0a (master) commit ad0cc02234e17ab1f43488c4393059ea1c9d8f95 (beta/2.3)
Author: Arne Schwabe <[email protected]...> Date: Wed Oct 17 12:46:14 2012 +0200
Options parsing demands unnecessary configuration if PKCS11 is used
In the old patch the if incorrectly closed the outer if condition.
(closes ticket #231)
Trac-ticket: 231
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: David Sommerseth <[email protected]...>
Message-Id: [email protected]...
URL: http://article.gmane.org/gmane.network.openvpn.devel/7095
Signed-off-by: David Sommerseth <[email protected]...>kind regards,
David Sommerseth