james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed nspr stuff.

Browse Source
This commit is contained in:
Alessio Di Mauro
2015-08-21 13:20:01 +02:00
parent 0c3c9c5a00
commit 5d7f0b3d93
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -52,7 +52,7 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(OPENSSL, libcrypto) PKG_CHECK_MODULES(OPENSSL, libcrypto)
PKG_CHECK_MODULES([LIBNSPR], [nspr], [], []) #PKG_CHECK_MODULES([LIBNSPR], [nspr], [], [])
gl_LD_VERSION_SCRIPT gl_LD_VERSION_SCRIPT
gl_VALGRIND_TESTS gl_VALGRIND_TESTS
ykcs11/Makefile.am
+2 -2
View File
@@ -28,7 +28,7 @@ SUBDIRS = .
#tests #tests
AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
AM_CPPFLAGS = $(OPENSSL_CFLAGS) $(PCSC_CFLAGS) $(LIBNSPR_CFLAGS) AM_CPPFLAGS = $(OPENSSL_CFLAGS) $(PCSC_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_builddir)/lib
lib_LTLIBRARIES = libykcs11.la lib_LTLIBRARIES = libykcs11.la
@@ -56,7 +56,7 @@ EXTRA_libykcs11_la_DEPENDENCIES = ykcs11.map
#libykcs11_la_LIBADD = $(OPENSSL_LIBS) $(PCSC_LIBS) #libykcs11_la_LIBADD = $(OPENSSL_LIBS) $(PCSC_LIBS)
#libykcs11_la_LIBADD += $(PCSC_WIN_LIBS) $(PCSC_MACOSX_LIBS) #libykcs11_la_LIBADD += $(PCSC_WIN_LIBS) $(PCSC_MACOSX_LIBS)
libykcs11_la_LIBADD = $(LIBNSPR) ../lib/libykpiv.la libykcs11_la_LIBADD = ../lib/libykpiv.la
libykcs11_la_LIBADD += ../tool/libpiv_util.la libykcs11_la_LIBADD += ../tool/libpiv_util.la
libykcs11_la_LDFLAGS = -no-undefined libykcs11_la_LDFLAGS = -no-undefined
ykcs11/pkcs11t.h
+4 -4
View File
@@ -52,14 +52,14 @@
#define CK_TRUE (!CK_FALSE) #define CK_TRUE (!CK_FALSE)
#endif #endif
#include "prtypes.h" //#include "prtypes.h"
#define CK_PTR * #define CK_PTR *
#define CK_NULL_PTR 0 #define CK_NULL_PTR 0
#define NULL_PTR 0 #define NULL_PTR 0
#define CK_CALLBACK_FUNCTION(rv,func) rv (PR_CALLBACK * func) #define CK_CALLBACK_FUNCTION(rv,func) rv (/*PR_CALLBACK*/ * func)
#define CK_DECLARE_FUNCTION(rv,func) PR_EXTERN(rv) func #define CK_DECLARE_FUNCTION(rv,func) /*PR_EXTERN(*/rv/*)*/ func
#define CK_DECLARE_FUNCTION_POINTER(rv,func) rv (PR_CALLBACK * func) #define CK_DECLARE_FUNCTION_POINTER(rv,func) rv (/*PR_CALLBACK*/ * func)
#define CK_DEFINE_FUNCTION(rv, func) rv func #define CK_DEFINE_FUNCTION(rv, func) rv func
/* an unsigned 8-bit value */ /* an unsigned 8-bit value */
ykcs11/slot_vendors.c
+1
View File
@@ -1,5 +1,6 @@
#include "slot_vendors.h" #include "slot_vendors.h"
#include "yubico_slot.h" #include "yubico_slot.h"
#include <stdlib.h>
slot_vendor_t get_slot_vendor(vendor_id_t vid) { slot_vendor_t get_slot_vendor(vendor_id_t vid) {
slot_vendor_t v; slot_vendor_t v;