From 54b88ae4606265f3d51c1ca603dbf846f3dfd678 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 3 Dec 2020 15:28:35 +0900 Subject: scd: Fix KEYINFO command with --data option. * scd/command.c (cmd_keyinfo): Handle --data option correctly. Signed-off-by: NIIBE Yutaka --- scd/command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scd/command.c') diff --git a/scd/command.c b/scd/command.c index 5bb52246b..258a9022d 100644 --- a/scd/command.c +++ b/scd/command.c @@ -2106,6 +2106,8 @@ cmd_keyinfo (assuan_context_t ctx, char *line) ctrl_t ctrl = assuan_get_pointer (ctx); card_t card; + opt_data = has_option (line, "--data"); + cap = 0; keygrip_str = NULL; if (has_option (line, "--list")) @@ -2117,10 +2119,7 @@ cmd_keyinfo (assuan_context_t ctx, char *line) else if (has_option (line, "--list=auth")) cap = GCRY_PK_USAGE_AUTH; else - keygrip_str = line; - - opt_data = has_option (line, "--data"); - line = skip_options (line); + keygrip_str = skip_options (line); if (opt_data) action = KEYGRIP_ACTION_SEND_DATA; -- cgit v1.2.3