renamed libpace to libnpa

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@403 96b47cad-a561-4643-ad3b-153ac7d7599c

ccid/src/Makefile.am

@@ -31,8 +31,8 @@ endif
 
 
 if WITH_PACE
-ccid_emulator_LDADD += $(LIBPACE_LIBS)
-ccid_emulator_CFLAGS += $(LIBPACE_CFLAGS)
+ccid_emulator_LDADD += $(LIBNPA_LIBS)
+ccid_emulator_CFLAGS += $(LIBNPA_CFLAGS)
 else
 ccid_emulator_SOURCES += scutil.c
 ccid_emulator_LDADD += $(OPENSC_LIBS)

ccid/src/ccid.c

@@ -30,9 +30,9 @@
 #include "config.h"
 
 #ifdef WITH_PACE
-#include <pace/pace.h>
-#include <pace/sm.h>
-#include <pace/scutil.h>
+#include <npa/npa.h>
+#include <npa/sm.h>
+#include <npa/scutil.h>
 
 static struct sm_ctx sctx;
 #ifdef BUERGERCLIENT_WORKAROUND
@@ -154,7 +154,7 @@ void ccid_shutdown()
         sc_release_context(ctx);
 
 #ifdef WITH_PACE
-    pace_sm_ctx_clear_free(sctx.cipher_ctx);
+    npa_sm_ctx_clear_free(sctx.cipher_ctx);
     memset(&sctx, 0, sizeof(sctx));
 #ifdef BUERGERCLIENT_WORKAROUND
     free(ef_cardaccess);

ccid/src/ccid.h

@@ -260,7 +260,7 @@ typedef struct {
 } __attribute__ ((packed)) RDR_to_PC_Parameters_t;
 typedef struct {
     __u8   bMessageType;
-    __u8   bmSlotICCState; /* we support 4 slots, so we need 2*4 bits = 1 byte */
+    __u8   bmSlotICCState; /* we support 1 slots, so we need 2*1 bits = 1 byte */
 } __attribute__ ((packed)) RDR_to_PC_NotifySlotChange_t;
 
 struct hid_class_descriptor {

ccid/src/scutil.h

@@ -1 +1 @@
-../../npa/src/pace/scutil.h
+../../npa/src/npa/scutil.h

ccid/src/usb.c

@@ -1805,8 +1805,8 @@ main (int argc, char **argv)
 
 
     if (doinfo) {
-        fprintf(stderr, "%s 0.9  written by Frank Morgner.\n\n" ,
-                argv[0]);
+        fprintf(stderr, "%s %s  written by Frank Morgner.\n\n" ,
+                argv[0], VERSION);
         return print_avail(verbose);
     }