[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r5299 - in trunk/softHSM: . checks src/bin src/lib src/lib/cryptoki_compat

Rickard Bellgrim rickard at opendnssec.org
Thu Jul 7 13:09:10 CEST 2011


Author: rb
Date: 2011-07-07 13:09:10 +0200 (Thu, 07 Jul 2011)
New Revision: 5299

Added:
   trunk/softHSM/checks/cryptoki.h
   trunk/softHSM/src/bin/cryptoki.h
   trunk/softHSM/src/lib/cryptoki.h
Modified:
   trunk/softHSM/NEWS
   trunk/softHSM/checks/checks.c
   trunk/softHSM/src/bin/Makefile.am
   trunk/softHSM/src/bin/softhsm.h
   trunk/softHSM/src/lib/Makefile.am
   trunk/softHSM/src/lib/MutexFactory.h
   trunk/softHSM/src/lib/SoftDatabase.h
   trunk/softHSM/src/lib/SoftFind.h
   trunk/softHSM/src/lib/SoftHSMInternal.h
   trunk/softHSM/src/lib/SoftKeyStore.h
   trunk/softHSM/src/lib/SoftSession.h
   trunk/softHSM/src/lib/SoftSlot.h
   trunk/softHSM/src/lib/attribute.h
   trunk/softHSM/src/lib/cryptoki_compat/pkcs11.h
   trunk/softHSM/src/lib/file.h
   trunk/softHSM/src/lib/main.h
   trunk/softHSM/src/lib/mechanisms.h
   trunk/softHSM/src/lib/osmutex.h
   trunk/softHSM/src/lib/tokenhandling.h
   trunk/softHSM/src/lib/userhandling.h
Log:
Use CRYPTOKI_EXPORTS in the library.


Modified: trunk/softHSM/NEWS
===================================================================
--- trunk/softHSM/NEWS	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/NEWS	2011-07-07 11:09:10 UTC (rev 5299)
@@ -24,7 +24,8 @@
 * Better exception handling.
 * CKF_USER_PIN_COUNT_LOW and CKF_SO_PIN_COUNT_LOW must be set 
   if an incorrect PIN has been entered at least once.
-* Detect LoadLibrary on Windows.
+* Windows: Detect LoadLibrary.
+* Windows: Set CRYPTOKI_EXPORTS.
 
 
 SoftHSM 1.2.1 - 2011-05-03 

Modified: trunk/softHSM/checks/checks.c
===================================================================
--- trunk/softHSM/checks/checks.c	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/checks/checks.c	2011-07-07 11:09:10 UTC (rev 5299)
@@ -28,7 +28,7 @@
 
 #include <config.h>
 #include "checks.h"
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 #include <stdio.h>
 #include <stdlib.h>


Property changes on: trunk/softHSM/checks/cryptoki.h
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/softHSM/src/bin/Makefile.am
===================================================================
--- trunk/softHSM/src/bin/Makefile.am	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/bin/Makefile.am	2011-07-07 11:09:10 UTC (rev 5299)
@@ -11,7 +11,7 @@
 
 bin_PROGRAMS =		softhsm softhsm-keyconv
 
-softhsm_SOURCES =	softhsm.cpp softhsm.h
+softhsm_SOURCES =	softhsm.cpp softhsm.h cryptoki.h
 softhsm_LDADD =		@SQLITE3_LIBS@ @BOTAN_LIBS@ @YIELD_LIB@
 
 softhsm_keyconv_SOURCES =	softhsm-keyconv.cpp softhsm-keyconv.h \


Property changes on: trunk/softHSM/src/bin/cryptoki.h
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/softHSM/src/bin/softhsm.h
===================================================================
--- trunk/softHSM/src/bin/softhsm.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/bin/softhsm.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -29,7 +29,7 @@
 #ifndef SOFTHSM_SOFTHSM_H
 #define SOFTHSM_SOFTHSM_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 #include <sqlite3.h>
 
 // Includes for the crypto library

Modified: trunk/softHSM/src/lib/Makefile.am
===================================================================
--- trunk/softHSM/src/lib/Makefile.am	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/Makefile.am	2011-07-07 11:09:10 UTC (rev 5299)
@@ -24,6 +24,7 @@
 				SoftDatabase.cpp SoftDatabase.h \
 				SoftKeyStore.cpp SoftKeyStore.h \
 				util.h \
+				cryptoki.h \
 				cryptoki_compat/pkcs11.h
 libsofthsm_la_LIBADD =		@BOTAN_LIBS@ @SQLITE3_LIBS@ @YIELD_LIB@
 libsofthsm_la_LDFLAGS =		-version-info @VERSION_INFO@ \

Modified: trunk/softHSM/src/lib/MutexFactory.h
===================================================================
--- trunk/softHSM/src/lib/MutexFactory.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/MutexFactory.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -37,7 +37,7 @@
 
 #include "config.h"
 #include "osmutex.h"
-#include "pkcs11.h"
+#include "cryptoki.h"
 #include <memory>
 
 class Mutex

Modified: trunk/softHSM/src/lib/SoftDatabase.h
===================================================================
--- trunk/softHSM/src/lib/SoftDatabase.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/SoftDatabase.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -35,7 +35,7 @@
 #ifndef SOFTHSM_SOFTDATABASE_H
 #define SOFTHSM_SOFTDATABASE_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 // The SQLite header
 #include <sqlite3.h>

Modified: trunk/softHSM/src/lib/SoftFind.h
===================================================================
--- trunk/softHSM/src/lib/SoftFind.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/SoftFind.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -36,7 +36,7 @@
 #ifndef SOFTHSM_SOFTFIND_H
 #define SOFTHSM_SOFTFIND_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 class SoftFind {
   public:

Modified: trunk/softHSM/src/lib/SoftHSMInternal.h
===================================================================
--- trunk/softHSM/src/lib/SoftHSMInternal.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/SoftHSMInternal.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -36,7 +36,7 @@
 #ifndef SOFTHSM_SOFTHSMINTERNAL_H
 #define SOFTHSM_SOFTHSMINTERNAL_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 #include "SoftFind.h"
 #include "SoftDatabase.h"
 #include "SoftSession.h"

Modified: trunk/softHSM/src/lib/SoftKeyStore.h
===================================================================
--- trunk/softHSM/src/lib/SoftKeyStore.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/SoftKeyStore.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -41,7 +41,7 @@
 #ifndef SOFTHSM_SOFTKEYSTORE_H
 #define SOFTHSM_SOFTKEYSTORE_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 // Includes for the crypto library
 #include <botan/pk_keys.h>

Modified: trunk/softHSM/src/lib/SoftSession.h
===================================================================
--- trunk/softHSM/src/lib/SoftSession.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/SoftSession.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -37,7 +37,7 @@
 #define SOFTHSM_SOFTSESSION_H 1
 
 #include "config.h"
-#include "pkcs11.h"
+#include "cryptoki.h"
 #include "SoftFind.h"
 #include "SoftDatabase.h"
 #include "SoftKeyStore.h"

Modified: trunk/softHSM/src/lib/SoftSlot.h
===================================================================
--- trunk/softHSM/src/lib/SoftSlot.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/SoftSlot.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -37,7 +37,7 @@
 
 #include "SoftSession.h"
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 // Includes for the crypto library
 #include <botan/rng.h>

Modified: trunk/softHSM/src/lib/attribute.h
===================================================================
--- trunk/softHSM/src/lib/attribute.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/attribute.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -29,7 +29,7 @@
 #ifndef SOFTHSM_ATTRIBUTE_H
 #define SOFTHSM_ATTRIBUTE_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 // Includes for the crypto library
 #include <botan/rng.h>


Property changes on: trunk/softHSM/src/lib/cryptoki.h
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/softHSM/src/lib/cryptoki_compat/pkcs11.h
===================================================================
--- trunk/softHSM/src/lib/cryptoki_compat/pkcs11.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/cryptoki_compat/pkcs11.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -95,7 +95,6 @@
 
 #endif
 
-

 #ifdef CRYPTOKI_COMPAT
   /* If we are in compatibility mode, switch all exposed names to the
      PKCS #11 variant.  There are corresponding #undefs below.  */
@@ -181,8 +180,6 @@
 
 #endif	/* CRYPTOKI_COMPAT */
 
-

-
 typedef unsigned long ck_flags_t;
 
 struct ck_version
@@ -1182,7 +1179,6 @@
 #define CKR_VENDOR_DEFINED			((unsigned long) (1 << 31))
 
 
-

 /* Compatibility layer.  */
 
 #ifdef CRYPTOKI_COMPAT
@@ -1344,7 +1340,6 @@
 
 #endif	/* CRYPTOKI_COMPAT */
 
-

 /* System dependencies.  */
 #if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
 #pragma pack(pop, cryptoki)

Modified: trunk/softHSM/src/lib/file.h
===================================================================
--- trunk/softHSM/src/lib/file.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/file.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -29,7 +29,7 @@
 #ifndef SOFTHSM_FILE_H
 #define SOFTHSM_FILE_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 CK_RV readConfigFile();
 

Modified: trunk/softHSM/src/lib/main.h
===================================================================
--- trunk/softHSM/src/lib/main.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/main.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -29,7 +29,7 @@
 #ifndef SOFTHSM_MAIN_H
 #define SOFTHSM_MAIN_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 class SoftSession;
 

Modified: trunk/softHSM/src/lib/mechanisms.h
===================================================================
--- trunk/softHSM/src/lib/mechanisms.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/mechanisms.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -29,7 +29,7 @@
 #ifndef SOFTHSM_MECHANISMS_H
 #define SOFTHSM_MECHANISMS_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 // The number of supported mechanisms
 #define NR_SUPPORTED_MECHANISMS 15

Modified: trunk/softHSM/src/lib/osmutex.h
===================================================================
--- trunk/softHSM/src/lib/osmutex.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/osmutex.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -37,7 +37,7 @@
 #define _SOFTHSM_OSMUTEX_H
 
 #include "config.h"
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 CK_RV OSCreateMutex(CK_VOID_PTR_PTR newMutex);
 CK_RV OSDestroyMutex(CK_VOID_PTR mutex);

Modified: trunk/softHSM/src/lib/tokenhandling.h
===================================================================
--- trunk/softHSM/src/lib/tokenhandling.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/tokenhandling.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -29,7 +29,7 @@
 #ifndef SOFTHSM_TOKENHANDLING_H
 #define SOFTHSM_TOKENHANDLING_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 #include "SoftSlot.h"
 
 CK_RV softInitToken(SoftSlot *currentSlot, CK_UTF8CHAR_PTR pPin, CK_ULONG ulPinLen, CK_UTF8CHAR_PTR pLabel);

Modified: trunk/softHSM/src/lib/userhandling.h
===================================================================
--- trunk/softHSM/src/lib/userhandling.h	2011-07-07 10:14:00 UTC (rev 5298)
+++ trunk/softHSM/src/lib/userhandling.h	2011-07-07 11:09:10 UTC (rev 5299)
@@ -29,7 +29,7 @@
 #ifndef SOFTHSM_USERHANDLING_H
 #define SOFTHSM_USERHANDLING_H 1
 
-#include "pkcs11.h"
+#include "cryptoki.h"
 
 CK_BBOOL userAuthorization(CK_STATE sessionState, CK_BBOOL isTokenObject, CK_BBOOL isPrivateObject, int userAction);
 char* digestPIN(CK_UTF8CHAR_PTR pPin, CK_ULONG ulPinLen);




More information about the Opendnssec-commits mailing list