aboutsummaryrefslogtreecommitdiff
path: root/pkcs11-helper-config.h
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2006-04-05 07:17:02 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2006-04-05 07:17:02 +0000
commit18597b93f7b43f63173f373fbd8548f2d08e25bb (patch)
tree31287d7784477dff653e5b92daee22872f58cab2 /pkcs11-helper-config.h
parentAdded man page entry for --setenv-safe. (diff)
downloadopenvpn-18597b93f7b43f63173f373fbd8548f2d08e25bb.tar.xz
I've recently worked on a better version of pkcs11-helper. I've also merged
it into QCA (Qt Cryptographic Architecture), so that KDE 4 will finally be able to use smartcards. The changes allows the following features: 1. Thread safe, is activated if USE_PTHREAD. 2. Slot event - Will allow us in the future to disconnect VPN when smartcard is removed. In order to support this OpenVPN must support threading... At least SIGUSR1 from a different thread. Threading should be supported in both Windows and Linux. -- currently disabled. When I talk about threading support it is just support in configuration script and that the method that SIGUSR1 self can be called from a different thread. I already handle the monitor threads. 3. Certificate enumeration - Will allow us to finally have one configuration file for all users! When you add the plugin GUI stuff you talked about, we will be able to display a list of available certificates for the user to select. -- currently disabled. 4. Data object manipulation - Will allow us to store tls-auth on the smartcard as well. -- currently disabled. 5. Many other minor improvements. Alon Bar-Lev git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@990 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'pkcs11-helper-config.h')
-rw-r--r--pkcs11-helper-config.h67
1 files changed, 38 insertions, 29 deletions
diff --git a/pkcs11-helper-config.h b/pkcs11-helper-config.h
index f5d4608..d3276ed 100644
--- a/pkcs11-helper-config.h
+++ b/pkcs11-helper-config.h
@@ -22,10 +22,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __PKCS11_HELPER_CONFIG_H
-#define __PKCS11_HELPER_CONFIG_H
+#ifndef __PKCS11H_HELPER_CONFIG_H
+#define __PKCS11H_HELPER_CONFIG_H
-#if!defined(PKCS11H_NO_NEED_INCLUDE_CONFIG)
+#if !defined(PKCS11H_NO_NEED_INCLUDE_CONFIG)
#if defined(WIN32)
#include "config-win32.h"
@@ -38,33 +38,26 @@
#endif /* PKCS11H_NO_NEED_INCLUDE_CONFIG */
#ifdef ENABLE_PKCS11
-#define PKCS11H_ENABLE_HELPER
+#define ENABLE_PKCS11H_HELPER
#endif
-#ifdef PKCS11H_ENABLE_HELPER
+#ifdef ENABLE_PKCS11H_HELPER
#include "error.h"
#include "misc.h"
#include "ssl.h"
-#define PKCS11ASSERT ASSERT
-#define PKCS11LOG msg
-#define PKCS11DLOG dmsg
-#define PKCS11_LOG_DEBUG2 D_PKCS11_DEBUG
-#define PKCS11_LOG_DEBUG1 D_SHOW_PKCS11
-#define PKCS11_LOG_INFO M_INFO
-#define PKCS11_LOG_WARN M_WARN
-#define PKCS11_LOG_ERROR M_FATAL
+#undef PKCS11H_USE_CYGWIN /* cygwin is not supported in openvpn */
-#undef PKCS11_USE_CYGWIN
-
-#if !defined(false)
-#define false 0
+#if !defined(FALSE)
+#define FALSE false
#endif
-#if !defined(true)
-#define true (!false)
+#if !defined(TRUE)
+#define TRUE true
#endif
+typedef bool PKCS11H_BOOL;
+
#if !defined(IN)
#define IN
#endif
@@ -72,18 +65,34 @@
#define OUT
#endif
-#define PKCS11_PRM_SLOT_TYPE "--pkcs11-slot-type"
-#define PKCS11_PRM_SLOT_ID "--pkcs11-slot"
-#define PKCS11_PRM_OBJ_TYPE "--pkcs11-id-type"
-#define PKCS11_PRM_OBJ_ID "--pkcs11-id"
-
-#define PKCS11_TIME openvpn_time
-
-#if defined(WIN32) || defined(PKCS11_USE_CYGWIN)
+#ifdef ENABLE_DEBUG
+#define ENABLE_PKCS11H_DEBUG
+#endif
+#ifdef USE_PTHREAD
+#define ENABLE_PKCS11H_THREADING
+#endif
+#undef ENABLE_PKCS11H_TOKEN
+#undef ENABLE_PKCS11H_DATA
+#define ENABLE_PKCS11H_CERTIFICATE
+#define ENABLE_PKCS11H_LOCATE
+#undef ENABLE_PKCS11H_ENUM
+#undef ENABLE_PKCS11H_SLOTEVENT
+#define ENABLE_PKCS11H_OPENSSL
+#define ENABLE_PKCS11H_STANDALONE
+
+#define PKCS11H_PRM_SLOT_TYPE "--pkcs11-slot-type"
+#define PKCS11H_PRM_SLOT_ID "--pkcs11-slot"
+#define PKCS11H_PRM_OBJ_TYPE "--pkcs11-id-type"
+#define PKCS11H_PRM_OBJ_ID "--pkcs11-id"
+
+#define PKCS11H_ASSERT ASSERT
+#define PKCS11H_TIME openvpn_time
+
+#if defined(WIN32) || defined(PKCS11H_USE_CYGWIN)
#include "cryptoki-win32.h"
#else
#include "cryptoki.h"
#endif
-#endif /* PKCS11H_ENABLE_HELPER */
-#endif /* __PKCS11_HELPER_CONFIG_H */
+#endif /* PKCS11_ENABLE_HELPER */
+#endif /* __PKCS11H_HELPER_CONFIG_H */