opensc: update source, refresh patches

Also import two new GnuK-related patches.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2015-05-13 12:58:16 +02:00
parent a7526b1a08
commit 764c55e013
29 changed files with 361 additions and 329 deletions

View File

@@ -8,11 +8,11 @@ Subject: [PATCH 18/26] Move declaration to top of block.
src/libopensc/card-openpgp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
index ca0d01b..037ef73 100644
--- a/src/libopensc/card-openpgp.c
+++ b/src/libopensc/card-openpgp.c
@@ -738,6 +738,7 @@ pgp_read_blob(sc_card_t *card, struct blob *blob)
Index: opensc-20150513/src/libopensc/card-openpgp.c
===================================================================
--- opensc-20150513.orig/src/libopensc/card-openpgp.c
+++ opensc-20150513/src/libopensc/card-openpgp.c
@@ -746,6 +746,7 @@ pgp_read_blob(sc_card_t *card, struct bl
u8 buffer[2048];
size_t buf_len = (card->caps & SC_CARD_CAP_APDU_EXT)
? sizeof(buffer) : 256;
@@ -20,7 +20,7 @@ index ca0d01b..037ef73 100644
/* Buffer length for certificate */
if (blob->id == DO_CERT && priv->max_cert_size > 0) {
@@ -751,7 +752,7 @@ pgp_read_blob(sc_card_t *card, struct blob *blob)
@@ -759,7 +760,7 @@ pgp_read_blob(sc_card_t *card, struct bl
buf_len = MAXLEN_RESP_PUBKEY_GNUK;
}
@@ -29,6 +29,3 @@ index ca0d01b..037ef73 100644
if (r < 0) { /* an error occurred */
blob->status = r;
--
2.1.3