oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hx509: explicitly include ref/pkcs11.h

Browse Source 
review comment from Nico Williams: explicitly include ref/pkcs11.h to
avoid any conflict with system PKCS#11 header
This commit is contained in:
Luke Howard
2015-12-09 11:03:48 +11:00
parent 0de138a7dc
commit f789d8403e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/hx509/Makefile.am
View File

@@ -107,7 +107,7 @@ libhx509_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
endif endif
$(libhx509_la_OBJECTS): $(srcdir)/version-script.map $(nodist_include_HEADERS) $(priv_headers) $(libhx509_la_OBJECTS): $(srcdir)/version-script.map $(nodist_include_HEADERS) $(priv_headers)
libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_hcrypto) libhx509_la_CPPFLAGS = $(INCLUDE_hcrypto)
nodist_libhx509_la_SOURCES = $(BUILT_SOURCES) nodist_libhx509_la_SOURCES = $(BUILT_SOURCES)
$(gen_files_ocsp) ocsp_asn1.hx ocsp_asn1-priv.hx: ocsp_asn1_files $(gen_files_ocsp) ocsp_asn1.hx ocsp_asn1-priv.hx: ocsp_asn1_files
@@ -207,7 +207,7 @@ check_PROGRAMS = $(PROGRAM_TESTS) test_soft_pkcs11
LDADD = libhx509.la LDADD = libhx509.la
test_soft_pkcs11_LDADD = libhx509.la test_soft_pkcs11_LDADD = libhx509.la
test_soft_pkcs11_CPPFLAGS = $(INCLUDE_hcrypto) -I$(srcdir)/ref test_soft_pkcs11_CPPFLAGS = $(INCLUDE_hcrypto)
test_name_CPPFLAGS = $(INCLUDE_hcrypto) test_name_CPPFLAGS = $(INCLUDE_hcrypto)
test_name_LDADD = libhx509.la $(LIB_roken) test_name_LDADD = libhx509.la $(LIB_roken)

2
lib/hx509/NTMakefile
View File

@@ -30,7 +30,7 @@
# #
RELDIR=lib\hx509 RELDIR=lib\hx509
intcflags=-I$(SRCDIR)\ref -I$(OBJ) intcflags=-I$(OBJ)
localcflags=-DASN1_LIB localcflags=-DASN1_LIB
!include ../../windows/NTMakefile.w32 !include ../../windows/NTMakefile.w32

2
lib/hx509/ks_p11.c
View File

@@ -38,7 +38,7 @@
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
#include "pkcs11.h" #include "ref/pkcs11.h"
struct p11_slot { struct p11_slot {
int flags; int flags;

2
lib/hx509/softp11.c
View File

@@ -34,7 +34,7 @@
#define CRYPTOKI_EXPORTS 1 #define CRYPTOKI_EXPORTS 1
#include "hx_locl.h" #include "hx_locl.h"
#include "pkcs11.h" #include "ref/pkcs11.h"
#define OBJECT_ID_MASK 0xfff #define OBJECT_ID_MASK 0xfff
#define HANDLE_OBJECT_ID(h) ((h) & OBJECT_ID_MASK) #define HANDLE_OBJECT_ID(h) ((h) & OBJECT_ID_MASK)

2
lib/hx509/test_soft_pkcs11.c
View File

@@ -32,7 +32,7 @@
*/ */
#include "hx_locl.h" #include "hx_locl.h"
#include "pkcs11.h" #include "ref/pkcs11.h"
#include <err.h> #include <err.h>
static CK_FUNCTION_LIST_PTR func; static CK_FUNCTION_LIST_PTR func;