openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 03:54:34 +04:00
Code Issues Packages Projects Releases Wiki Activity

opensc: update source, refresh patches

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/opensc/patches/0024-OpenPGP-Fix-crash-after-accessing-inexistent-file.patch
View File

@@ -8,11 +8,11 @@ Subject: [PATCH 24/26] OpenPGP: Fix crash after accessing inexistent file.
src/libopensc/card-openpgp.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
index ca3173c..94c69ae 100644
--- a/src/libopensc/card-openpgp.c
+++ b/src/libopensc/card-openpgp.c
@@ -973,7 +973,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
Index: opensc-20150513/src/libopensc/card-openpgp.c
===================================================================
--- opensc-20150513.orig/src/libopensc/card-openpgp.c
+++ opensc-20150513/src/libopensc/card-openpgp.c
@@ -981,7 +981,6 @@ pgp_select_file(sc_card_t *card, const s
* So we set its size to be the same as max certificate size the card supports. */
(*ret)->size = priv->max_cert_size;
}
@@ -20,7 +20,7 @@ index ca3173c..94c69ae 100644
LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
}
@@ -990,7 +989,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
@@ -998,7 +997,6 @@ pgp_select_file(sc_card_t *card, const s
/* This file ID is refered when importing key&certificate via pkcs15init, like above.
* We pretend to successfully find this inexistent file. */
if (id == 0x4402 || id == 0x5f48) {
@@ -28,7 +28,7 @@ index ca3173c..94c69ae 100644
if (ret == NULL)
/* No need to return file */
LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
@@ -1002,7 +1000,6 @@ pgp_select_file(sc_card_t *card, const sc_path_t *path, sc_file_t **ret)
@@ -1010,7 +1008,6 @@ pgp_select_file(sc_card_t *card, const s
}
if (r < 0) { /* failure */
@@ -36,6 +36,3 @@ index ca3173c..94c69ae 100644
LOG_FUNC_RETURN(card->ctx, r);
}
}
--
2.1.3