51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 42adc35954e18e24f253f710b16d850d1872bce5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
|
|
<ng.hong.quan@gmail.com>
|
|
Date: Wed, 27 Mar 2013 11:38:42 +0700
|
|
Subject: [PATCH 09/26] PKCS15-OpenPGP: Do not show empty DO in pkcs15
|
|
emu_init.
|
|
|
|
---
|
|
src/libopensc/pkcs15-openpgp.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
Index: opensc-20150513/src/libopensc/pkcs15-openpgp.c
|
|
===================================================================
|
|
--- opensc-20150513.orig/src/libopensc/pkcs15-openpgp.c
|
|
+++ opensc-20150513/src/libopensc/pkcs15-openpgp.c
|
|
@@ -383,16 +383,34 @@ sc_pkcs15emu_openpgp_add_data(sc_pkcs15_
|
|
sc_pkcs15_object_t dat_obj;
|
|
char name[8];
|
|
char path[9];
|
|
+ u8 content[254];
|
|
memset(&dat_info, 0, sizeof(dat_info));
|
|
memset(&dat_obj, 0, sizeof(dat_obj));
|
|
|
|
sprintf(name, "PrivDO%d", i);
|
|
sprintf(path, "3F00010%d", i);
|
|
|
|
+ /* Check if the DO can be read.
|
|
+ * We won't expose pkcs15 DATA object if DO is empty.
|
|
+ */
|
|
+ r = read_file(p15card->card, path, content, sizeof(content));
|
|
+ if (r <= 0 ) {
|
|
+ sc_log(ctx, "Cannot read DO 010%d or there is no data in it", i);
|
|
+ /* Skip */
|
|
+ continue;
|
|
+ }
|
|
sc_format_path(path, &dat_info.path);
|
|
strlcpy(dat_obj.label, name, sizeof(dat_obj.label));
|
|
strlcpy(dat_info.app_label, name, sizeof(dat_info.app_label));
|
|
|
|
+ /* Add DATA object to slot protected by PIN2 (PW1 with Ref 0x82) */
|
|
+ dat_obj.flags = SC_PKCS15_CO_FLAG_PRIVATE | SC_PKCS15_CO_FLAG_MODIFIABLE;
|
|
+ dat_obj.auth_id.len = 1;
|
|
+ if (i == 1 || i == 3)
|
|
+ dat_obj.auth_id.value[0] = 2;
|
|
+ else
|
|
+ dat_obj.auth_id.value[0] = 3;
|
|
+
|
|
sc_log(ctx, "Add %s data object", name);
|
|
r = sc_pkcs15emu_add_data_object(p15card, &dat_obj, &dat_info);
|
|
}
|