Merged with Alon's r688.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/pkcs11.h b/pkcs11.h
index a6f0f89..4e4a95b 100644
--- a/pkcs11.h
+++ b/pkcs11.h
@@ -30,18 +30,18 @@
 #include <openssl/ssl.h>
 
 void
-init_pkcs11 (
+pkcs11_initialize (
 	const int nPINCachePeriod
 );
 
 void
-free_pkcs11 ();
+pkcs11_terminate ();
 
 void
-fork_fix_pkcs11 ();
+pkcs11_forkFixup ();
 
 void
-add_pkcs11 (
+pkcs11_addProvider (
 	const char * const provider,
 	const char * const sign_mode
 );
@@ -58,15 +58,11 @@ SSL_CTX_use_pkcs11 (
 
 void
 show_pkcs11_slots (
-	const int msglev,
-	const int warnlev,
 	const char * const provider
 );
 
 void
 show_pkcs11_objects (
-	const int msglev,
-	const int warnlev,
 	const char * const provider,
 	const char * const slot,
 	const char * const pin