Merged PKCS#11 patch.

Pre-2.1_beta3


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

1 files changed, 7 insertions, 0 deletions

diff --git a/options.h b/options.h
index c4d21ab..3df6ecb 100644
--- a/options.h
+++ b/options.h
@@ -377,6 +377,13 @@ struct options
   const char *tls_remote;
   const char *crl_file;
   int ns_cert_type; /* set to 0, NS_SSL_SERVER, or NS_SSL_CLIENT */
+  const char *pkcs11_providers[MAX_PARMS];
+  const char *pkcs11_sign_mode[MAX_PARMS];
+  const char *pkcs11_slot_type;
+  const char *pkcs11_slot;
+  const char *pkcs11_id_type;
+  const char *pkcs11_id;
+  bool pkcs11_protected_authentication;
 #ifdef WIN32
   const char *cryptoapi_cert;
 #endif