explicitly import libpkcs11.h
This commit is contained in:
parent
6f9b58af72
commit
fe95520e3e
|
@ -33,12 +33,10 @@
|
||||||
|
|
||||||
#define CRYPTOKI_EXPORTS
|
#define CRYPTOKI_EXPORTS
|
||||||
#include "pkcs11-display.h"
|
#include "pkcs11-display.h"
|
||||||
|
#include "common/libpkcs11.h"
|
||||||
|
|
||||||
#define __PASTE(x,y) x##y
|
#define __PASTE(x,y) x##y
|
||||||
|
|
||||||
extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
|
|
||||||
extern CK_RV C_UnloadModule(void *module);
|
|
||||||
|
|
||||||
/* Declare all spy_* Cryptoki function */
|
/* Declare all spy_* Cryptoki function */
|
||||||
|
|
||||||
/* Spy Module Function List */
|
/* Spy Module Function List */
|
||||||
|
|
|
@ -47,9 +47,6 @@ extern "C" {
|
||||||
|
|
||||||
#define SC_PKCS11_SLOT_FOR_PINS (SC_PKCS11_SLOT_FOR_PIN_USER | SC_PKCS11_SLOT_FOR_PIN_SIGN)
|
#define SC_PKCS11_SLOT_FOR_PINS (SC_PKCS11_SLOT_FOR_PIN_USER | SC_PKCS11_SLOT_FOR_PIN_SIGN)
|
||||||
|
|
||||||
extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
|
|
||||||
extern CK_RV C_UnloadModule(void *module);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -60,6 +60,7 @@
|
||||||
#include "libopensc/asn1.h"
|
#include "libopensc/asn1.h"
|
||||||
#include "common/compat_strlcat.h"
|
#include "common/compat_strlcat.h"
|
||||||
#include "common/compat_strlcpy.h"
|
#include "common/compat_strlcpy.h"
|
||||||
|
#include "common/libpkcs11.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "libopensc/sc-ossl-compat.h"
|
#include "libopensc/sc-ossl-compat.h"
|
||||||
|
|
||||||
|
@ -69,8 +70,6 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
|
|
||||||
extern CK_RV C_UnloadModule(void *module);
|
|
||||||
#ifndef ENABLE_SHARED
|
#ifndef ENABLE_SHARED
|
||||||
extern CK_FUNCTION_LIST pkcs11_function_list;
|
extern CK_FUNCTION_LIST pkcs11_function_list;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue