Minor PKCS#11 changes.

pre-2.1_beta3

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

diff --git a/ChangeLog b/ChangeLog
index 521f348d6566359eb4b43e949a0bf838fa2c8fc5..0658da61e46f5d7b6a7de94888616fb9e198ce31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
 
 $Id$
 
-2005.10.14 -- Version 2.1-beta3
+2005.10.xx -- Version 2.1-beta3
 
 * Added PKCS#11 support (Alon Bar-Lev).
 * NOTE TO PACKAGE MAINTAINERS: Moved "plugin"
@@ -15,8 +15,6 @@ $Id$
 
 2005.10.13 -- Version 2.1-beta2
 
-* Added --socket-flags directive with TCP_NODELAY
-  flag (pushable).
 * Made --sndbuf and --rcvbuf pushable.
 
 2005.10.01 -- Version 2.1-beta1

diff --git a/openvpn.8 b/openvpn.8
index 7609324a58cd4555f7b1c274a22bf3cc1854fc46..4e4c81c9502c25ce164db551f709c087dd7317c5 100644 (file)
--- a/openvpn.8
+++ b/openvpn.8
@@ -254,7 +254,6 @@ openvpn \- secure IP tunnel daemon.
 [\ \fB\-\-show\-valid\-subnets\fR\ ]
 [\ \fB\-\-single\-session\fR\ ]
 [\ \fB\-\-sndbuf\fR\ \fIsize\fR\ ]
-[\ \fB\-\-socket\-flags\fR\ \fI[flags,\ ...]\fR\ ]
 [\ \fB\-\-socks\-proxy\-retry\fR\ ]
 [\ \fB\-\-socks\-proxy\fR\ \fIserver\ [port]\fR\ ]
 [\ \fB\-\-status\fR\ \fIfile\ [n]\fR\ ]
@@ -1319,15 +1318,6 @@ Set the TCP/UDP socket receive buffer size.
 Currently defaults to 65536 bytes.
 .\"*********************************************************
 .TP
-.B --socket-flags [flags, ...]
-Set one or more of the following socket flags:
-
-.B TCP_NODELAY --
-Optimize latency in TCP mode tunnels.
-
-This directive is pushable.
-.\"*********************************************************
-.TP
 .B --txqueuelen n
 (Linux only) Set the TX queue length on the TUN/TAP interface.
 Currently defaults to 100.

diff --git a/options.c b/options.c
index eccb63e754c0272b38ddb0b81fcc8d2261d66ca4..c7e788fbb0aa5b72523b5df5ce3350db578ebea9 100644 (file)
--- a/options.c
+++ b/options.c
@@ -207,7 +207,6 @@ static const char usage_message[] =
   "                  or --fragment max value, whichever is lower.\n"
   "--sndbuf size   : Set the TCP/UDP send buffer size.\n"
   "--rcvbuf size   : Set the TCP/UDP receive buffer size.\n"
-  "--socket-flags f: Set socket flags, currently 'TCP_NODELAY' supported.\n"
   "--txqueuelen n  : Set the tun/tap TX queue length to n (Linux only).\n"
   "--mlock         : Disable Paging -- ensures key material and tunnel\n"
   "                  data will never be written to disk.\n"

diff --git a/pkcs11.c b/pkcs11.c
index 25ad5257a00f43206c867383cff40e7441e0e98d..d0bdbbeea6b5d0b9d5fc8c994e435d9b8105c90e 100644 (file)
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -1068,8 +1068,8 @@ pkcs11_createSession (
 
        if (rv == CKR_OK) {
                pkcs11_session->fLoginFailed = false;
-               pkcs11_session->key = -1;
-               pkcs11_session->session = -1;
+               pkcs11_session->key = (CK_OBJECT_HANDLE)-1;
+               pkcs11_session->session = (CK_SESSION_HANDLE)-1;
 
                if (!strcmp (szSlotType, "id")) {
                        rv = _pkcs11_getSlotById (pkcs11_session, szSlot);
@@ -1210,11 +1210,11 @@ pkcs11_logout (
 ) {
        ASSERT (pkcs11_session!=NULL);
 
-       if (pkcs11_session->session != (unsigned int)-1) {
+       if (pkcs11_session->session != (CK_SESSION_HANDLE)-1) {
                pkcs11_session->provider->f->C_Logout (pkcs11_session->session);
                pkcs11_session->provider->f->C_CloseSession (pkcs11_session->session);
-               pkcs11_session->key = -1;
-               pkcs11_session->session = -1;
+               pkcs11_session->key = (CK_OBJECT_HANDLE)-1;
+               pkcs11_session->session = (CK_SESSION_HANDLE)-1;
        }
 
        return CKR_OK;

diff --git a/pkcs11.h b/pkcs11.h
index 488a59157270c750588d2dfb3d91c0759e7a664a..7f44e1ba4cebd361256c4ebea063903b577b5847 100644 (file)
--- a/pkcs11.h
+++ b/pkcs11.h
@@ -25,6 +25,8 @@
 #ifndef OPENVPN_PKCS11_H
 #define OPENVPN_PKCS11_H
 
+#if defined(USE_CRYPTO) && defined(USE_SSL) && defined(ENABLE_PKCS11)
+
 int
 SSL_CTX_use_pkcs11 (
        SSL_CTX * const ssl_ctx,
@@ -62,3 +64,5 @@ show_pkcs11_objects (
 );
 
 #endif
+
+#endif