md: integrate JPKI (#964)

* set pin_flags * set dummy serial number * add CA certificates * set cert flags
OpenSC · Mar 3, 2017 · 51ba288 · 51ba288
1 parent 890d978
commit 51ba288
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/src/libopensc/card-jpki.c b/src/libopensc/card-jpki.c
@@ -182,8 +182,13 @@ jpki_select_file(struct sc_card *card,
 		LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
 	}
 
-	/* read size of auth certificate file */
-	if (path->len == 2 && memcmp(path->value, "\x00\x0a", 2) == 0) {
+	/* read certificate file size */
+	if (path->len == 2 && (
+		    memcmp(path->value, "\x00\x0A", 2) == 0 ||
+		    memcmp(path->value, "\x00\x01", 2) == 0 ||
+		    memcmp(path->value, "\x00\x0B", 2) == 0 ||
+		    memcmp(path->value, "\x00\x02", 2) == 0 )
+		) {
 		u8 buf[4];
 		rc = sc_read_binary(card, 0, buf, 4, 0);
 		LOG_TEST_RET(card->ctx, rc, "SW Check failed");
@@ -195,7 +200,6 @@ jpki_select_file(struct sc_card *card,
 		file->size = (buf[2] << 8 | buf[3]) + 4;
 		*file_out = file;
 	}
-
 	LOG_FUNC_RETURN(card->ctx, SC_SUCCESS);
 }
 

diff --git a/src/libopensc/pkcs15-jpki.c b/src/libopensc/pkcs15-jpki.c
@@ -47,8 +47,8 @@ sc_pkcs15emu_jpki_init(sc_pkcs15_card_t * p15card)
 
 	p15card->tokeninfo->label = strdup("JPKI");
 	p15card->tokeninfo->manufacturer_id = strdup("JPKI");
-	/* set NULL until we found serial number */
-	p15card->tokeninfo->serial_number = NULL;
+	/* set dummy until we found serial number */
+	p15card->tokeninfo->serial_number = strdup("00000000");
 
 	/* Select application directory */
 	if (drvdata->selected != SELECT_JPKI_AP) {
@@ -58,30 +58,40 @@ sc_pkcs15emu_jpki_init(sc_pkcs15_card_t * p15card)
 	}
 
 	/* add certificates */
-	for (i = 0; i < 2; i++) {
-		static const char *jpki_cert_names[2] = {
+	for (i = 0; i < 4; i++) {
+		static const char *jpki_cert_names[4] = {
 			"User Authentication Certificate",
-			"Digital Signature Certificate"
+			"Digital Signature Certificate",
+			"User Authentication Certificate CA",
+			"Digital Signature Certificate CA"
 		};
-		static char const *jpki_cert_paths[2] = {
+		static char const *jpki_cert_paths[4] = {
 			"000A",
-			"0001"
+			"0001",
+			"000B",
+			"0002"
 		};
-		static int jpki_cert_ids[2] = { 1, 2 };
-
+		static int jpki_cert_ids[4] = { 1, 2, 3, 4 };
+		static int jpki_cert_flags[4] = {
+			0,
+			SC_PKCS15_CO_FLAG_PRIVATE,
+			0,
+			0,
+		};
+		static int jpki_cert_authority[4] = {0, 0, 1, 1};
 		struct sc_pkcs15_cert_info cert_info;
 		struct sc_pkcs15_object cert_obj;
-		memset(&cert_info, 0, sizeof (cert_info));
-		memset(&cert_obj, 0, sizeof (cert_obj));
+		memset(&cert_info, 0, sizeof(cert_info));
+		memset(&cert_obj, 0, sizeof(cert_obj));
 
 		cert_info.id.value[0] = jpki_cert_ids[i];
 		cert_info.id.len = 1;
 		sc_format_path(jpki_cert_paths[i], &cert_info.path);
 		cert_info.path.type = SC_PATH_TYPE_FILE_ID;
 
-		strlcpy(cert_obj.label, jpki_cert_names[i], sizeof (cert_obj.label));
-		cert_obj.flags = 0;
-
+		strlcpy(cert_obj.label, jpki_cert_names[i], sizeof(cert_obj.label));
+		cert_info.authority = jpki_cert_authority[i];
+		cert_obj.flags = jpki_cert_flags[i];
 		rc = sc_pkcs15emu_add_x509_cert(p15card, &cert_obj, &cert_info);
 		if (rc < 0)
 			LOG_FUNC_RETURN(card->ctx, SC_ERROR_INTERNAL);
@@ -98,7 +108,12 @@ sc_pkcs15emu_jpki_init(sc_pkcs15_card_t * p15card)
 		static const int jpki_pin_max[2] = { 4, 16 };
 		static const int jpki_pin_ref[2] = { 1, 2 };
 		static const int jpki_pin_authid[2] = { 1, 2 };
-		static const int jpki_pin_flags[2] = { 0, 0 };
+		static const int jpki_pin_flags[2] = {
+			SC_PKCS15_PIN_FLAG_INITIALIZED |
+			SC_PKCS15_PIN_FLAG_LOCAL,
+			SC_PKCS15_PIN_FLAG_INITIALIZED |
+			SC_PKCS15_PIN_FLAG_LOCAL
+		};
 		static const int jpki_pin_max_tries[2] = {
 			JPKI_AUTH_PIN_MAX_TRIES,
 			JPKI_SIGN_PIN_MAX_TRIES

diff --git a/win32/customactions.cpp b/win32/customactions.cpp
@@ -108,6 +108,8 @@ MD_REGISTRATION minidriver_registration[] = {
                                           12, {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}},
 	{TEXT("CardOS v5.0"),                     {0x3b,0xd2,0x18,0x00,0x81,0x31,0xfe,0x58,0xc9,0x01,0x14},
                                           11, {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}},
+	{TEXT("JPKI"),                            {0x3b,0xe0,0x00,0xff,0x81,0x31,0xfe,0x45,0x14},
+                                          9, {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}},
 };