From 77a52cc8e9727a6332330ebe394175d3cbb2db63 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Wed, 21 Nov 2012 17:45:22 +0100
Subject: [PATCH] adapted to changes of OpenSC master

Now works with the stupid changes of OpenSC made in
41861e42b01539856b31f758dfde9ba53749eaaa
---
 npa/src/npa.c     | 5 +++--
 npa/src/npa/npa.h | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/npa/src/npa.c b/npa/src/npa.c
index fee1f4f..08eb16b 100644
--- a/npa/src/npa.c
+++ b/npa/src/npa.c
@@ -1240,8 +1240,9 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card,
         }
     }
 
-    if (card->reader->capabilities & SC_READER_CAP_PACE_GENERIC) {
-        r = sc_perform_pace(card, &pace_input, pace_output);
+    if (card->reader->capabilities & SC_READER_CAP_PACE_GENERIC
+            && card->reader->ops->perform_pace) {
+        r = card->reader->ops->perform_pace(card->reader, &pace_input, pace_output);
     } else {
         if (!pace_output->ef_cardaccess_length || !pace_output->ef_cardaccess) {
             r = get_ef_card_access(oldnpactx, card, &pace_output->ef_cardaccess,
diff --git a/npa/src/npa/npa.h b/npa/src/npa/npa.h
index 7a39ae0..7659106 100644
--- a/npa/src/npa/npa.h
+++ b/npa/src/npa/npa.h
@@ -29,6 +29,7 @@
 #include <eac/eac.h>
 #include <eac/pace.h>
 #include <libopensc/opensc.h>
+#include <libopensc/pace.h>
 #include <npa/sm.h>
 
 #ifdef __cplusplus