diff options
| author | Werner Koch <[email protected]> | 2021-08-19 12:08:14 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-08-20 07:54:00 +0000 |
| commit | 6685696adafba104072303507dedbbd45731d326 (patch) | |
| tree | a9e92b35a863295aca42023bafe4d84d173cb55c | |
| parent | agent: Improve the GENPIN callback. (diff) | |
| download | gnupg-6685696adafba104072303507dedbbd45731d326.tar.gz gnupg-6685696adafba104072303507dedbbd45731d326.zip | |
gpg: Return SUCCESS/FAILURE status also for --card-edit/name.
* g10/card-util.c (change_name): Call write_sc_op_status.
--
Reported-by: Joey Berkovitz
| -rw-r--r-- | g10/card-util.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index d9716a700..242fa94dd 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -764,7 +764,8 @@ static int change_name (void) { char *surname = NULL, *givenname = NULL; - char *isoname, *p; + char *isoname = NULL; + char *p; int rc; surname = get_one_name ("keygen.smartcard.surname", @@ -775,7 +776,8 @@ change_name (void) { xfree (surname); xfree (givenname); - return -1; /*canceled*/ + rc = gpg_error (GPG_ERR_CANCELED); + goto leave; } isoname = xmalloc ( strlen (surname) + 2 + strlen (givenname) + 1); @@ -791,14 +793,17 @@ change_name (void) tty_printf (_("Error: Combined name too long " "(limit is %d characters).\n"), 39); xfree (isoname); - return -1; + rc = gpg_error (GPG_ERR_TOO_LARGE); + goto leave; } rc = agent_scd_setattr ("DISP-NAME", isoname, strlen (isoname)); if (rc) log_error ("error setting Name: %s\n", gpg_strerror (rc)); + leave: xfree (isoname); + write_sc_op_status (rc); return rc; } |