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

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


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

3 files changed, 12 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index cc763c9..87d2f5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,10 +3,6 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
 
 $Id$
 
-2005.10.xx -- Version 2.1-beta5
-
-* More PKCS#11 additions/changes (Alon Bar-Lev).
-
 2005.10.17 -- Version 2.1-beta4
 
 * Fixed bug introduced in 2.1-beta3 where management
diff --git a/configure.ac b/configure.ac
index 2fed39b..1056887 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 
-AC_INIT([OpenVPN], [2.1_beta5], [openvpn-users@lists.sourceforge.net], [openvpn])
+AC_INIT([OpenVPN], [2.1_beta4], [openvpn-users@lists.sourceforge.net], [openvpn])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(syshead.h)
 
@@ -386,7 +386,7 @@ AC_FUNC_MEMCMP
 
 AC_CHECK_FUNCS(socket recv recvfrom send sendto listen dnl
 	       accept connect bind select gethostbyname dnl
-               inet_ntoa time ctime memset vsnprintf, [],
+               inet_ntoa time ctime memset vsnprintf strdup, [],
 	       [AC_MSG_ERROR([Required library function not found])])
 
 dnl
diff --git a/pkcs11.c b/pkcs11.c
index 54dc532..8dd9dfe 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -1465,18 +1465,18 @@ static
 CK_RV
 pkcs11_forkFixup () {
 
-	pkcs11_provider_t current;
+	if (pkcs11_data != NULL && pkcs11_data->fInitialized) {
 
-	ASSERT (pkcs11_data!=NULL);
-	ASSERT (pkcs11_data->fInitialized);
+		pkcs11_provider_t current;
 
-	for (
-		current = pkcs11_data->providers;
-		current != NULL;
-		current = current->next
-	) {
-		if (current->fEnabled) {
-			current->f->C_Initialize (NULL);
+		for (
+			current = pkcs11_data->providers;
+			current != NULL;
+			current = current->next
+		) {
+			if (current->fEnabled) {
+				current->f->C_Initialize (NULL);
+			}
 		}
 	}