Fixed segfault that occurred if remote_cert_eku is undefined and no

server certificate verification method was enabled.
Don't declare pkcs11 variables in struct options unless pkcs11
support is enabled.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@833 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 4 insertions, 0 deletions

diff --git a/options.h b/options.h
index 32e511c..3c3c202 100644
--- a/options.h
+++ b/options.h
@@ -396,6 +396,8 @@ struct options
   int ns_cert_type; /* set to 0, NS_SSL_SERVER, or NS_SSL_CLIENT */
   unsigned remote_cert_ku[MAX_PARMS];
   const char *remote_cert_eku;
+
+#ifdef ENABLE_PKCS11
   const char *pkcs11_providers[MAX_PARMS];
   const char *pkcs11_sign_mode[MAX_PARMS];
   const char *pkcs11_slot_type;
@@ -405,6 +407,8 @@ struct options
   int pkcs11_pin_cache_period;
   bool pkcs11_protected_authentication;
   bool pkcs11_cert_private;
+#endif
+
 #ifdef WIN32
   const char *cryptoapi_cert;
 #endif