From 5d7f0b3d931be440be32dabb4c15804b64932e4e Mon Sep 17 00:00:00 2001
From: Alessio Di Mauro <alessio@yubico.com>
Date: Fri, 21 Aug 2015 13:20:01 +0200
Subject: [PATCH] Removed nspr stuff.

---
 configure.ac          | 2 +-
 ykcs11/Makefile.am    | 4 ++--
 ykcs11/pkcs11t.h      | 8 ++++----
 ykcs11/slot_vendors.c | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 273efdc..ec89a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ PKG_PROG_PKG_CONFIG
 
 PKG_CHECK_MODULES(OPENSSL, libcrypto)
 
-PKG_CHECK_MODULES([LIBNSPR], [nspr], [], [])
+#PKG_CHECK_MODULES([LIBNSPR], [nspr], [], [])
 
 gl_LD_VERSION_SCRIPT
 gl_VALGRIND_TESTS
diff --git a/ykcs11/Makefile.am b/ykcs11/Makefile.am
index fdd13af..6d7845a 100644
--- a/ykcs11/Makefile.am
+++ b/ykcs11/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = .
 #tests
 
 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
 
 lib_LTLIBRARIES = libykcs11.la
@@ -56,7 +56,7 @@ EXTRA_libykcs11_la_DEPENDENCIES = ykcs11.map
 
 #libykcs11_la_LIBADD = $(OPENSSL_LIBS) $(PCSC_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_LDFLAGS = -no-undefined
diff --git a/ykcs11/pkcs11t.h b/ykcs11/pkcs11t.h
index 5b64d63..9543f5c 100644
--- a/ykcs11/pkcs11t.h
+++ b/ykcs11/pkcs11t.h
@@ -52,14 +52,14 @@
 #define CK_TRUE              (!CK_FALSE)
 #endif
 
-#include "prtypes.h"
+//#include "prtypes.h"
 
 #define CK_PTR *
 #define CK_NULL_PTR 0
 #define NULL_PTR 0
-#define CK_CALLBACK_FUNCTION(rv,func) rv (PR_CALLBACK * func)
-#define CK_DECLARE_FUNCTION(rv,func) PR_EXTERN(rv) func
-#define CK_DECLARE_FUNCTION_POINTER(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_POINTER(rv,func) rv (/*PR_CALLBACK*/ * func)
 #define CK_DEFINE_FUNCTION(rv, func) rv func
 
 /* an unsigned 8-bit value */
diff --git a/ykcs11/slot_vendors.c b/ykcs11/slot_vendors.c
index 2158512..5ce9fed 100644
--- a/ykcs11/slot_vendors.c
+++ b/ykcs11/slot_vendors.c
@@ -1,5 +1,6 @@
 #include "slot_vendors.h"
 #include "yubico_slot.h"
+#include <stdlib.h>
 
 slot_vendor_t get_slot_vendor(vendor_id_t vid) {
   slot_vendor_t v;