giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed import of multiple symbols 

regression of 45a7ea9737075b5901fe7a5d65ed898733140315:
due to the change in the linkage, the symbols should be found in
opensc.dll instead of the static support libraries.
This commit is contained in:
Frank Morgner 2017-03-23 21:03:07 +01:00
parent 0ec89941b2
commit 77f6e94e6f
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/Makefile.am
View File

@ -38,7 +38,7 @@ LIBS = \
$(top_builddir)/src/common/libcompat.la
sceac_example_SOURCES = sceac-example.c
sceac_example_LDADD = $(top_builddir)/src/sm/libsmeac.la $(top_builddir)/src/libopensc/libopensc.la $(OPENPACE_LIBS)
sceac_example_LDADD = $(top_builddir)/src/libopensc/libopensc.la $(OPENPACE_LIBS)
sceac_example_CFLAGS = -I$(top_srcdir)/src $(OPENPACE_CFLAGS)
opensc_tool_SOURCES = opensc-tool.c util.c
@ -78,7 +78,6 @@ gids_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
npa_tool_SOURCES = npa-tool.c fread_to_eof.c $(NPA_TOOL_BUILT_SOURCES)
npa_tool_LDADD = $(top_builddir)/src/libopensc/libopensc.la \
$(top_builddir)/src/sm/libsmeac.la \
$(OPENPACE_LIBS)
npa_tool_CFLAGS = -I$(top_srcdir)/src $(OPENPACE_CFLAGS) $(OPENSSL_CFLAGS)

2
src/tools/Makefile.mak
View File

@ -14,8 +14,6 @@ LIBS = $(TOPDIR)\src\common\common.lib \
$(TOPDIR)\src\libopensc\opensc.lib \
$(TOPDIR)\src\pkcs15init\pkcs15init.lib \
$(TOPDIR)\src\common\libpkcs11.lib \
$(TOPDIR)\src\sm\libsmeac.lib \
$(TOPDIR)\src\sm\libsmiso.lib \
$(TOPDIR)\src\common\libscdl.lib
all: $(TARGETS)

15
src/tools/npa-tool.c
View File

@ -81,6 +81,21 @@ static int getline(char **lineptr, size_t *n, FILE *stream)
}
#endif
/* we don't want to export this from libopensc so we implement it here, again */
#include <openssl/asn1t.h>
#define ASN1_APP_IMP_OPT(stname, field, type, tag) ASN1_EX_TYPE(ASN1_TFLG_IMPTAG|ASN1_TFLG_APPLICATION|ASN1_TFLG_OPTIONAL, tag, stname, field, type)
#define ASN1_APP_IMP(stname, field, type, tag) ASN1_EX_TYPE(ASN1_TFLG_IMPTAG|ASN1_TFLG_APPLICATION, tag, stname, field, type)
/* 0x67
* Auxiliary authenticated data */
ASN1_ITEM_TEMPLATE(ASN1_AUXILIARY_DATA) =
ASN1_EX_TEMPLATE_TYPE(
ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_IMPTAG|ASN1_TFLG_APPLICATION,
7, AuxiliaryAuthenticatedData, CVC_DISCRETIONARY_DATA_TEMPLATE)
ASN1_ITEM_TEMPLATE_END(ASN1_AUXILIARY_DATA)
IMPLEMENT_ASN1_FUNCTIONS(ASN1_AUXILIARY_DATA)
/**
* @brief Print binary data to a file stream
*