diff options
Diffstat (limited to 'debian/patches/cherry-picked')
2 files changed, 95 insertions, 0 deletions
diff --git a/debian/patches/cherry-picked/1617856888.gnupg-2.3.0-4-gab66c4357.scd-fix-ccid-driver-for-scm-spr332-spr532.patch b/debian/patches/cherry-picked/1617856888.gnupg-2.3.0-4-gab66c4357.scd-fix-ccid-driver-for-scm-spr332-spr532.patch new file mode 100644 index 0000000..a54ff93 --- /dev/null +++ b/debian/patches/cherry-picked/1617856888.gnupg-2.3.0-4-gab66c4357.scd-fix-ccid-driver-for-scm-spr332-spr532.patch @@ -0,0 +1,48 @@ +Subject: Scd: Fix CCID driver for SCM SPR332/SPR532 +Origin: gnupg-2.3.0-4-gab66c4357 +Upstream-Author: NIIBE Yutaka <gniibe@fsij.org> +Date: Thu Apr 8 13:41:28 2021 +0900 +Bug-Debian: https://bugs.debian.org/982546 + + * scd/ccid-driver.c (ccid_vendor_specific_pinpad_setup): New. + (ccid_vendor_specific_setup): Only send CLEAR_HALT. + (ccid_transceive_secure): Each time, use send_escape_cmd. + + -- + + GnuPG-bug-id: 5297 + Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> + +--- a/scd/ccid-driver.c ++++ b/scd/ccid-driver.c +@@ -1304,10 +1304,20 @@ + { + if (handle->id_vendor == VENDOR_SCM && handle->id_product == SCM_SPR532) + { ++ libusb_clear_halt (handle->idev, handle->ep_intr); ++ } ++ return 0; ++} ++ ++ ++static int ++ccid_vendor_specific_pinpad_setup (ccid_driver_t handle) ++{ ++ if (handle->id_vendor == VENDOR_SCM && handle->id_product == SCM_SPR532) ++ { + DEBUGOUT ("sending escape sequence to switch to a case 1 APDU\n"); + send_escape_cmd (handle, (const unsigned char*)"\x80\x02\x00", 3, + NULL, 0, NULL); +- libusb_clear_halt (handle->idev, handle->ep_intr); + } + return 0; + } +@@ -3583,6 +3593,8 @@ + if (pininfo->fixedlen < 0 || pininfo->fixedlen >= 16) + return CCID_DRIVER_ERR_NOT_SUPPORTED; + ++ ccid_vendor_specific_pinpad_setup (handle); ++ + msg = send_buffer; + msg[0] = cherry_mode? 0x89 : PC_to_RDR_Secure; + msg[5] = 0; /* slot */ diff --git a/debian/patches/cherry-picked/g10-Fix-garbled-status-messages-in-NOTATION_DATA.patch b/debian/patches/cherry-picked/g10-Fix-garbled-status-messages-in-NOTATION_DATA.patch new file mode 100644 index 0000000..d66b346 --- /dev/null +++ b/debian/patches/cherry-picked/g10-Fix-garbled-status-messages-in-NOTATION_DATA.patch @@ -0,0 +1,47 @@ +From: Werner Koch <wk@gnupg.org> +Date: Tue, 14 Jun 2022 11:33:27 +0200 +Subject: g10: Fix garbled status messages in NOTATION_DATA + +* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one +-- + +Depending on the escaping and line wrapping the computed remaining +buffer length could be wrong. Fixed by always using a break to +terminate the escape detection loop. Might have happened for all +status lines which may wrap. + +GnuPG-bug-id: T6027 +(cherry picked from commit 34c649b3601383cd11dbc76221747ec16fd68e1b) +--- + g10/cpr.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +diff --git a/g10/cpr.c b/g10/cpr.c +index d502e8b..bc4b715 100644 +--- a/g10/cpr.c ++++ b/g10/cpr.c +@@ -328,20 +328,15 @@ write_status_text_and_buffer (int no, const char *string, + } + first = 0; + } +- for (esc=0, s=buffer, n=len; n && !esc; s++, n--) ++ for (esc=0, s=buffer, n=len; n; s++, n--) + { + if (*s == '%' || *(const byte*)s <= lower_limit + || *(const byte*)s == 127 ) + esc = 1; + if (wrap && ++count > wrap) +- { +- dowrap=1; +- break; +- } +- } +- if (esc) +- { +- s--; n++; ++ dowrap=1; ++ if (esc || dowrap) ++ break; + } + if (s != buffer) + es_fwrite (buffer, s-buffer, 1, statusfp); |