adapted to changes of OpenPACE

npa/src/Makefile.am

@@ -17,17 +17,17 @@ dist_man1_MANS		= npa-tool.1
 AM_CPPFLAGS = -I$(top_srcdir)/src/npa -I$(top_srcdir)/src/opensc/src
 
 libnpa_la_SOURCES = sm.c scutil.c npa.c sslutil.c
-libnpa_la_LIBADD = $(OPENSSL_LIBS) $(OPENSC_LIBS)
-libnpa_la_CFLAGS = $(OPENSSL_CFLAGS)
+libnpa_la_LIBADD = $(OPENSSL_LIBS) $(OPENPACE_LIBS) $(OPENSC_LIBS)
+libnpa_la_CFLAGS = $(OPENSSL_CFLAGS) $(OPENPACE_CFLAGS)
 libnpa_la_LDFLAGS = -no-undefined
 
 npa_tool_SOURCES = npa-tool.c $(BUILT_SOURCES)
-npa_tool_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la
-npa_tool_CFLAGS = $(OPENSSL_CFLAGS)
+npa_tool_LDADD = $(OPENSSL_LIBS) $(OPENPACE_LIBS) $(OPENSC_LIBS) libnpa.la
+npa_tool_CFLAGS = $(OPENSSL_CFLAGS) $(OPENPACE_CFLAGS)
 
 example_SOURCES = example.c
-example_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la
-example_CFLAGS = $(OPENSSL_CFLAGS)
+example_LDADD = $(OPENSSL_LIBS) $(OPENPACE_LIBS) $(OPENSC_LIBS) libnpa.la
+example_CFLAGS = $(OPENSSL_CFLAGS) $(OPENPACE_CFLAGS)
 
 
 npa-tool.c: $(BUILT_SOURCES)

npa/src/npa-tool.c

@@ -18,10 +18,11 @@
  */
 #include "cmdline.h"
 #include "config.h"
+#include <eac/pace.h>
 #include <libopensc/log.h>
+#include <libopensc/opensc.h>
 #include <npa/npa.h>
 #include <npa/scutil.h>
-#include <openssl/pace.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

npa/src/npa.c

@@ -17,22 +17,22 @@
  * ccid.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "npa.h"
-#include "sm.h"
 #include "scutil.h"
+#include "sm.h"
 #include "sslutil.h"
+#include <eac/cv_cert.h>
+#include <eac/eac.h>
+#include <eac/pace.h>
+#include <eac/ta.h>
 #include <libopensc/asn1.h>
 #include <libopensc/log.h>
 #include <libopensc/opensc.h>
 #include <openssl/asn1t.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
-#include <openssl/cv_cert.h>
-#include <openssl/eac.h>
-#include <openssl/ta.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include <openssl/pace.h>
 #include <string.h>
 
 
@@ -173,6 +173,11 @@ struct npa_sm_ctx {
     BUF_MEM *auxiliary_data;
 };
 
+
+/* included in OpenPACE, but not propagated */
+extern BUF_MEM *BUF_MEM_create_init(const void *buf, size_t len);
+
+
 static int npa_sm_encrypt(sc_card_t *card, const struct sm_ctx *ctx,
         const u8 *data, size_t datalen, u8 **enc);
 static int npa_sm_decrypt(sc_card_t *card, const struct sm_ctx *ctx,

npa/src/npa/npa.h

@@ -26,10 +26,10 @@
 #ifndef _CCID_NPA_H
 #define _CCID_NPA_H
 
-#include <npa/sm.h>
+#include <eac/eac.h>
+#include <eac/pace.h>
 #include <libopensc/opensc.h>
-#include <openssl/eac.h>
-#include <openssl/pace.h>
+#include <npa/sm.h>
 
 #ifdef __cplusplus
 extern "C" {