1 From fbf8e392db4456de97796259a62ccb972fe24df8 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
3 <ng.hong.quan@gmail.com>
4 Date: Tue, 26 Feb 2013 17:37:16 +0700
5 Subject: [PATCH 04/18] PKCS15-OpenPGP: Declare DATA objects.
7 Begin to support read/write DATA object for PKCS-OpenPGP binding.
8 This object is used by TrueCrypt.
10 src/libopensc/pkcs15-openpgp.c | 35 +++++++++++++++++++++++++++++++++++
11 1 file changed, 35 insertions(+)
13 diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
14 index 5a8a1ca..9f239ef 100644
15 --- a/src/libopensc/pkcs15-openpgp.c
16 +++ b/src/libopensc/pkcs15-openpgp.c
17 @@ -36,6 +36,7 @@ typedef USHORT ushort;
20 int sc_pkcs15emu_openpgp_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);
21 +static int sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *);
24 #define PGP_USER_PIN_FLAGS (SC_PKCS15_PIN_FLAG_CASE_SENSITIVE \
25 @@ -45,6 +46,8 @@ int sc_pkcs15emu_openpgp_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);
26 | SC_PKCS15_PIN_FLAG_UNBLOCK_DISABLED \
27 | SC_PKCS15_PIN_FLAG_SO_PIN)
29 +#define PGP_NUM_PRIVDO 4
31 typedef struct _pgp_pin_cfg {
34 @@ -359,6 +362,9 @@ sc_pkcs15emu_openpgp_init(sc_pkcs15_card_t *p15card)
38 + /* PKCS#15 DATA object from OpenPGP private DOs */
39 + r = sc_pkcs15emu_openpgp_add_data(p15card);
43 failed: sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "Failed to initialize OpenPGP emulation: %s\n",
44 @@ -366,6 +372,35 @@ failed: sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "Failed to initialize OpenPGP e
49 +sc_pkcs15emu_openpgp_add_data(sc_pkcs15_card_t *p15card)
51 + sc_context_t *ctx = p15card->card->ctx;
54 + LOG_FUNC_CALLED(ctx);
55 + /* There is 4 private DO from 0101 to 0104 */
56 + for (i = 1; i <= PGP_NUM_PRIVDO; i++) {
57 + sc_pkcs15_data_info_t dat_info;
58 + sc_pkcs15_object_t dat_obj;
61 + memset(&dat_info, 0, sizeof(dat_info));
62 + memset(&dat_obj, 0, sizeof(dat_obj));
64 + sprintf(name, "PrivDO%d", i);
65 + sprintf(path, "3F00010%d", i);
67 + sc_format_path(path, &dat_info.path);
68 + strlcpy(dat_obj.label, name, sizeof(dat_obj.label));
69 + strlcpy(dat_info.app_label, name, sizeof(dat_info.app_label));
71 + sc_log(ctx, "Add %s data object", name);
72 + r = sc_pkcs15emu_add_data_object(p15card, &dat_obj, &dat_info);
74 + LOG_FUNC_RETURN(ctx, r);
77 static int openpgp_detect_card(sc_pkcs15_card_t *p15card)
79 if (p15card->card->type == SC_CARD_TYPE_OPENPGP_V1 || p15card->card->type == SC_CARD_TYPE_OPENPGP_V2