Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for D-Trust Card 5.1 & 5.4 #3137

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Add support for D-Trust Card 5.1 & 5.4 #3137

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
440c787
dtrust: Read serial number from EF.GDO
hamarituc May 8, 2024
e07fbce
dtrust: Identify D-Trust Card 5.1 & 5.4 (#3131)
hamarituc May 8, 2024
0cc7286
dtrust-tool: Establish PACE channel for D-Trust Card 5
hamarituc May 24, 2024
1654edf
dtrust-tool: Show PIN status for D-Trust Card 5
hamarituc May 24, 2024
dfa17f6
dtrust-tool: Don't show misleading "transport protection broken"
hamarituc May 24, 2024
7b67ecf
dtrust-tool: Show transport protection status for D-Trust Card 5
hamarituc May 24, 2024
f5c7080
dtrust-tool: Refactor PIN entry logic
hamarituc Jun 3, 2024
3734fd2
sm-eac: Allow non-standard PIN reference IDs for PACE
hamarituc Jun 3, 2024
8a27eaf
dtrust-tool: Unlock transport protection
hamarituc Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
dtrust-tool: Show PIN status for D-Trust Card 5
  • Loading branch information
@hamarituc
hamarituc committed Jun 3, 2024
commit 1654edf003fbcf1ed253ebb6e435948572ab0e4a
59 changes: 45 additions & 14 deletions src/tools/dtrust-tool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,22 +333,53 @@ main(int argc, char *argv[])
}
}

/*
* We have to select the QES app to verify and change the QES PIN.
*/
sc_format_path("3F000101", &path);
r = sc_select_file(card, &path, NULL);
if (r)
goto out;

if (opt_status) {
if (card->type == SC_CARD_TYPE_DTRUST_V4_1_STD ||
card->type == SC_CARD_TYPE_DTRUST_V4_1_MULTI ||
card->type == SC_CARD_TYPE_DTRUST_V4_1_M100)
switch (card->type) {
case SC_CARD_TYPE_DTRUST_V4_1_STD:
case SC_CARD_TYPE_DTRUST_V4_1_MULTI:
case SC_CARD_TYPE_DTRUST_V4_1_M100:
pin_status(card, 0x03, "Card Holder PIN");
pin_status(card, 0x04, "Card Holder PUK");
pin_status(card, 0x87, "Signature PIN");
pin_status(card, 0x8B, "Transport PIN");
/* FALLTHRU */

case SC_CARD_TYPE_DTRUST_V4_4_STD:
case SC_CARD_TYPE_DTRUST_V4_4_MULTI:
/* We have to select the QES app to verify and change the Signature PIN. */
sc_format_path("3F000101", &path);
r = sc_select_file(card, &path, NULL);
if (r)
goto out;

pin_status(card, 0x04, "Card Holder PUK");
pin_status(card, 0x87, "Signature PIN");
pin_status(card, 0x8B, "Transport PIN");
break;

case SC_CARD_TYPE_DTRUST_V5_1_STD:
case SC_CARD_TYPE_DTRUST_V5_1_MULTI:
case SC_CARD_TYPE_DTRUST_V5_1_M100:
/* We have to select the eSign app to verify and change the Authentication PIN. */
sc_format_path("3F000102", &path);
r = sc_select_file(card, &path, NULL);
if (r)
goto out;

pin_status(card, 0x91, "Authentication PIN");
pin_status(card, 0x0C, "Transport PIN (Authentication)");
/* FALLTHRU */

case SC_CARD_TYPE_DTRUST_V5_4_STD:
case SC_CARD_TYPE_DTRUST_V5_4_MULTI:
/* We have to select the QES app to verify and change the Signature PIN. */
sc_format_path("3F000101", &path);
r = sc_select_file(card, &path, NULL);
if (r)
goto out;

pin_status(card, 0x04, "Card Holder PUK");
pin_status(card, 0x87, "Signature PIN");
pin_status(card, 0x0B, "Transport PIN (Signature)");
break;
}
}

if (opt_check)
Expand Down