From cd3f780e5eb4ed04d5e890aeeaf2d13fed2fba8c Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Sat, 28 Apr 2007 19:56:22 +0000 Subject: Make cryptoki-log work with win32 --- pkcs11/cryptoki-unix.h | 55 +++++++++++++++++++++++++++++++++++++++++ pkcs11/cryptoki-win32.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ pkcs11/cryptoki.h | 55 ----------------------------------------- 3 files changed, 121 insertions(+), 55 deletions(-) create mode 100644 pkcs11/cryptoki-unix.h create mode 100644 pkcs11/cryptoki-win32.h delete mode 100644 pkcs11/cryptoki.h (limited to 'pkcs11') diff --git a/pkcs11/cryptoki-unix.h b/pkcs11/cryptoki-unix.h new file mode 100644 index 0000000..47c2a6e --- /dev/null +++ b/pkcs11/cryptoki-unix.h @@ -0,0 +1,55 @@ +/* cryptoki.h include file for PKCS #11. */ +/* $Revision: 1.4 $ */ + +/* License to copy and use this software is granted provided that it is + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * (Cryptoki)" in all material mentioning or referencing this software. + + * License is also granted to make and use derivative works provided that + * such works are identified as "derived from the RSA Security Inc. PKCS #11 + * Cryptographic Token Interface (Cryptoki)" in all material mentioning or + * referencing the derived work. + + * RSA Security Inc. makes no representations concerning either the + * merchantability of this software or the suitability of this software for + * any particular purpose. It is provided "as is" without express or implied + * warranty of any kind. + */ + +/* This is a sample file containing the top level include directives + * for building Win32 Cryptoki libraries and applications. + */ + +#ifndef ___CRYPTOKI_H_INC___ +#define ___CRYPTOKI_H_INC___ + +#ifndef CK_PTR +#define CK_PTR * +#endif + +#ifndef CK_DEFINE_FUNCTION +#define CK_DEFINE_FUNCTION(returnType, name) returnType name +#endif + +#ifndef CK_DECLARE_FUNCTION +#define CK_DECLARE_FUNCTION(returnType, name) returnType name +#endif + +#ifndef CK_DECLARE_FUNCTION_POINTER +#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) +#endif + +#ifndef CK_CALLBACK_FUNCTION +#define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) +#endif + +#ifndef NULL_PTR +#include /* For NULL */ +#define NULL_PTR NULL +#endif + +#define CK_NEED_ARG_LIST 1 + +#include "pkcs11.h" + +#endif /* ___CRYPTOKI_H_INC___ */ diff --git a/pkcs11/cryptoki-win32.h b/pkcs11/cryptoki-win32.h new file mode 100644 index 0000000..f457b3e --- /dev/null +++ b/pkcs11/cryptoki-win32.h @@ -0,0 +1,66 @@ +/* cryptoki.h include file for PKCS #11. */ +/* $Revision: 1.4 $ */ + +/* License to copy and use this software is granted provided that it is + * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface + * (Cryptoki)" in all material mentioning or referencing this software. + + * License is also granted to make and use derivative works provided that + * such works are identified as "derived from the RSA Security Inc. PKCS #11 + * Cryptographic Token Interface (Cryptoki)" in all material mentioning or + * referencing the derived work. + + * RSA Security Inc. makes no representations concerning either the + * merchantability of this software or the suitability of this software for + * any particular purpose. It is provided "as is" without express or implied + * warranty of any kind. + */ + +/* This is a sample file containing the top level include directives + * for building Win32 Cryptoki libraries and applications. + */ + +#ifndef ___CRYPTOKI_H_INC___ +#define ___CRYPTOKI_H_INC___ + +#pragma pack(push, cryptoki, 1) + +/* Specifies that the function is a DLL entry point. */ +#define CK_IMPORT_SPEC __declspec(dllimport) + +/* Define CRYPTOKI_EXPORTS during the build of cryptoki libraries. Do + * not define it in applications. + */ +#ifdef CRYPTOKI_EXPORTS +/* Specified that the function is an exported DLL entry point. */ +#define CK_EXPORT_SPEC __declspec(dllexport) +#else +#define CK_EXPORT_SPEC CK_IMPORT_SPEC +#endif + +/* Ensures the calling convention for Win32 builds */ +#define CK_CALL_SPEC __cdecl + +#define CK_PTR * + +#define CK_DEFINE_FUNCTION(returnType, name) \ + returnType CK_EXPORT_SPEC CK_CALL_SPEC name + +#define CK_DECLARE_FUNCTION(returnType, name) \ + returnType CK_EXPORT_SPEC CK_CALL_SPEC name + +#define CK_DECLARE_FUNCTION_POINTER(returnType, name) \ + returnType CK_IMPORT_SPEC (CK_CALL_SPEC CK_PTR name) + +#define CK_CALLBACK_FUNCTION(returnType, name) \ + returnType (CK_CALL_SPEC CK_PTR name) + +#ifndef NULL_PTR +#define NULL_PTR 0 +#endif + +#include "pkcs11.h" + +#pragma pack(pop, cryptoki) + +#endif /* ___CRYPTOKI_H_INC___ */ diff --git a/pkcs11/cryptoki.h b/pkcs11/cryptoki.h deleted file mode 100644 index 47c2a6e..0000000 --- a/pkcs11/cryptoki.h +++ /dev/null @@ -1,55 +0,0 @@ -/* cryptoki.h include file for PKCS #11. */ -/* $Revision: 1.4 $ */ - -/* License to copy and use this software is granted provided that it is - * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface - * (Cryptoki)" in all material mentioning or referencing this software. - - * License is also granted to make and use derivative works provided that - * such works are identified as "derived from the RSA Security Inc. PKCS #11 - * Cryptographic Token Interface (Cryptoki)" in all material mentioning or - * referencing the derived work. - - * RSA Security Inc. makes no representations concerning either the - * merchantability of this software or the suitability of this software for - * any particular purpose. It is provided "as is" without express or implied - * warranty of any kind. - */ - -/* This is a sample file containing the top level include directives - * for building Win32 Cryptoki libraries and applications. - */ - -#ifndef ___CRYPTOKI_H_INC___ -#define ___CRYPTOKI_H_INC___ - -#ifndef CK_PTR -#define CK_PTR * -#endif - -#ifndef CK_DEFINE_FUNCTION -#define CK_DEFINE_FUNCTION(returnType, name) returnType name -#endif - -#ifndef CK_DECLARE_FUNCTION -#define CK_DECLARE_FUNCTION(returnType, name) returnType name -#endif - -#ifndef CK_DECLARE_FUNCTION_POINTER -#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType (* name) -#endif - -#ifndef CK_CALLBACK_FUNCTION -#define CK_CALLBACK_FUNCTION(returnType, name) returnType (* name) -#endif - -#ifndef NULL_PTR -#include /* For NULL */ -#define NULL_PTR NULL -#endif - -#define CK_NEED_ARG_LIST 1 - -#include "pkcs11.h" - -#endif /* ___CRYPTOKI_H_INC___ */ -- cgit v1.2.3