Browse code
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 <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>
Arne Schwabe authored on 2012/10/17 19:46:14Showing 1 changed files
| ... | ... |
@@ -2192,13 +2192,15 @@ options_postprocess_verify_ce (const struct options *options, const struct conne |
| 2192 | 2192 |
} |
| 2193 | 2193 |
else |
| 2194 | 2194 |
#endif |
| 2195 |
-#ifdef ENABLE_CRYPTOAPI |
|
| 2196 | 2195 |
#ifdef MANAGMENT_EXTERNAL_KEY |
| 2197 | 2196 |
if((options->management_flags & MF_EXTERNAL_KEY) && options->priv_key_file) |
| 2198 |
- msg (M_USAGE, "--key and --management-external-key are mutually exclusive"); |
|
| 2197 |
+ {
|
|
| 2198 |
+ msg (M_USAGE, "--key and --management-external-key are mutually exclusive"); |
|
| 2199 |
+ } |
|
| 2200 |
+ else |
|
| 2199 | 2201 |
#endif |
| 2200 |
- |
|
| 2201 |
- if (options->cryptoapi_cert) |
|
| 2202 |
+#ifdef ENABLE_CRYPTOAPI |
|
| 2203 |
+ if (options->cryptoapi_cert) |
|
| 2202 | 2204 |
{
|
| 2203 | 2205 |
if ((!(options->ca_file)) && (!(options->ca_path))) |
| 2204 | 2206 |
msg(M_USAGE, "You must define CA file (--ca) or CA path (--capath)"); |