Brought up-to-date with Alon's PKCS11 patch at

https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21/openvpn@645
Pre-2.1_beta5


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

1 files changed, 19 insertions, 12 deletions

diff --git a/pkcs11.h b/pkcs11.h
index fdb1b91..a6f0f89 100644
--- a/pkcs11.h
+++ b/pkcs11.h
@@ -29,6 +29,23 @@
 
 #include <openssl/ssl.h>
 
+void
+init_pkcs11 (
+	const int nPINCachePeriod
+);
+
+void
+free_pkcs11 ();
+
+void
+fork_fix_pkcs11 ();
+
+void
+add_pkcs11 (
+	const char * const provider,
+	const char * const sign_mode
+);
+
 int
 SSL_CTX_use_pkcs11 (
 	SSL_CTX * const ssl_ctx,
@@ -36,20 +53,10 @@ SSL_CTX_use_pkcs11 (
 	const char * const pkcs11_slot,
 	const char * const pkcs11_id_type,
 	const char * const pkcs11_id,
-	const char * const pin,
 	const bool pkcs11_protected_authentication
 );
 
 void
-add_pkcs11 (
-	const char * const provider,
-	const char * const sign_mode
-);
-
-void
-free_pkcs11 ();
-
-void
 show_pkcs11_slots (
 	const int msglev,
 	const int warnlev,
@@ -65,6 +72,6 @@ show_pkcs11_objects (
 	const char * const pin
 );
 
-#endif
+#endif			/* ENABLE_PKCS11 */
 
-#endif
+#endif			/* OPENVPN_PKCS11_H */