From adac6a883f63d70cb490bc989605aaef8a397c10 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sat, 11 Apr 2020 10:09:27 -0400
Subject: [PATCH] ccid-emulator: Update to use OpenSC 0.20.0 release

---
 ccid/Makefile.am  | 3 +++
 ccid/src/OpenSC   | 2 +-
 ccid/src/ccid.c   | 8 ++++----
 ccid/src/scutil.c | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ccid/Makefile.am b/ccid/Makefile.am
index 7aa20d3..ba6b40b 100644
--- a/ccid/Makefile.am
+++ b/ccid/Makefile.am
@@ -9,6 +9,7 @@ EXTRA_DIST = docs patches
 all-local:
 	cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) all
 	cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) all
+	cd src/OpenSC/src/ui && $(MAKE) $(AM_MAKEFLAGS) all
 	cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) all
 	cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) all
 	cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) all
@@ -16,6 +17,7 @@ all-local:
 check-local:
 	cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) check
 	cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) check
+	cd src/OpenSC/src/ui && $(MAKE) $(AM_MAKEFLAGS) check
 	cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) check
 	cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) check
 	cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) check
@@ -23,6 +25,7 @@ check-local:
 clean-local:
 	cd src/OpenSC/src/common && $(MAKE) $(AM_MAKEFLAGS) clean
 	cd src/OpenSC/src/scconf && $(MAKE) $(AM_MAKEFLAGS) clean
+	cd src/OpenSC/src/ui && $(MAKE) $(AM_MAKEFLAGS) clean
 	cd src/OpenSC/src/pkcs15init && $(MAKE) $(AM_MAKEFLAGS) clean
 	cd src/OpenSC/src/sm && $(MAKE) $(AM_MAKEFLAGS) clean
 	cd src/OpenSC/src/libopensc && $(MAKE) $(AM_MAKEFLAGS) clean
diff --git a/ccid/src/OpenSC b/ccid/src/OpenSC
index 0ebe09f..45e2905 160000
--- a/ccid/src/OpenSC
+++ b/ccid/src/OpenSC
@@ -1 +1 @@
-Subproject commit 0ebe09f5f38a437df80f7f601bdf9305c5777c33
+Subproject commit 45e29056ccde422e70ed3585084a7f150c632515
diff --git a/ccid/src/ccid.c b/ccid/src/ccid.c
index f449fca..6a03767 100644
--- a/ccid/src/ccid.c
+++ b/ccid/src/ccid.c
@@ -19,7 +19,7 @@
 #include <asm/byteorder.h>
 #include <libopensc/log.h>
 #include <libopensc/opensc.h>
-#include <libopensc/reader-boxing.h>
+#include <libopensc/reader-tr03119.h>
 #include <libopensc/sm.h>
 #include <sm/sm-eac.h>
 #include <openssl/evp.h>
@@ -48,7 +48,7 @@ perform_pseudo_apdu_EstablishPACEChannel(sc_apdu_t *apdu)
     memset(&pace_input, 0, sizeof pace_input);
     memset(&pace_output, 0, sizeof pace_output);
 
-    r = boxing_buf_to_pace_input(reader->ctx, apdu->data, apdu->datalen,
+    r = escape_buf_to_pace_input(reader->ctx, apdu->data, apdu->datalen,
             &pace_input);
     if (r < 0)
         goto err;
@@ -58,7 +58,7 @@ perform_pseudo_apdu_EstablishPACEChannel(sc_apdu_t *apdu)
     if (r < 0)
         goto err;
 
-    r = boxing_pace_output_to_buf(reader->ctx, &pace_output, &apdu->resp,
+    r = escape_pace_output_to_buf(reader->ctx, &pace_output, &apdu->resp,
             &apdu->resplen);
 
 err:
@@ -81,7 +81,7 @@ perform_pseudo_apdu_GetReaderPACECapabilities(sc_apdu_t *apdu)
         | SC_READER_CAP_PACE_EID | SC_READER_CAP_PACE_ESIGN;
 
 
-    return boxing_pace_capabilities_to_buf(reader->ctx,
+    return escape_pace_capabilities_to_buf(reader->ctx,
             sc_reader_t_capabilities, &apdu->resp, &apdu->resplen);
 }
 
diff --git a/ccid/src/scutil.c b/ccid/src/scutil.c
index 7d6638d..c6c9e21 100644
--- a/ccid/src/scutil.c
+++ b/ccid/src/scutil.c
@@ -85,7 +85,7 @@ void _bin_log(sc_context_t *ctx, int type, const char *file, int line,
     if (!f) {
         char buf[1800];
         if (data)
-            sc_hex_dump(ctx, SC_LOG_DEBUG_NORMAL, data, len, buf, sizeof buf);
+            sc_hex_dump(data, len, buf, sizeof buf);
         else
             buf[0] = 0;
         sc_do_log(ctx, type, file, line, func,