diff options
| author | Werner Koch <[email protected]> | 2019-01-20 10:41:23 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-01-22 09:13:28 +0000 |
| commit | 9309175de8c76de44021c25c7885355ff1a9b67b (patch) | |
| tree | 14a82f519745a6eb62abf908f774ba624e006e63 /scd/command.c | |
| parent | ssh: Simplify the curve name lookup. (diff) | |
| download | gnupg-9309175de8c76de44021c25c7885355ff1a9b67b.tar.gz gnupg-9309175de8c76de44021c25c7885355ff1a9b67b.zip | |
scd: One new and one improved 7816 function.
* scd/apdu.c (apdu_send_direct): New arg R_SW.
* scd/command.c (cmd_apdu): Ditto.
* scd/iso7816.c (iso7816_apdu_direct): New arg R_SW.
(iso7816_general_authenticate): New.
* scd/app-nks.c (get_chv_status, get_nks_version): Pass NULL for new
arg.
--
iso7816_general_authenticate will be used for the PIV card support.
The new arg to iso7816_apdu_direct and apdu_send_direct allows to get
the raw status word back without the need to handle an output buffer.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit 70bb5c7931598590b1acfae90bf4657f5911d2d3)
Diffstat (limited to 'scd/command.c')
| -rw-r--r-- | scd/command.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scd/command.c b/scd/command.c index 0a9654693..8fa4b381c 100644 --- a/scd/command.c +++ b/scd/command.c @@ -333,7 +333,7 @@ static const char hlp_learn[] = "or a \"CANCEL\" to force the function to terminate with a Cancel\n" "error message.\n" "\n" - "With the option --keypairinfo only KEYPARIINFO lstatus lines are\n" + "With the option --keypairinfo only KEYPARIINFO status lines are\n" "returned.\n" "\n" "The response of this command is a list of status lines formatted as\n" @@ -346,6 +346,7 @@ static const char hlp_learn[] = " P15 = PKCS-15 structure used\n" " DINSIG = DIN SIG\n" " OPENPGP = OpenPGP card\n" + " PIV = PIV card\n" " NKS = NetKey card\n" "\n" "are implemented. These strings are aliases for the AID\n" @@ -1640,7 +1641,7 @@ cmd_apdu (assuan_context_t ctx, char *line) rc = apdu_send_direct (app->slot, exlen, apdu, apdulen, handle_more, - &result, &resultlen); + NULL, &result, &resultlen); if (rc) log_error ("apdu_send_direct failed: %s\n", gpg_strerror (rc)); else |