security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* call-dirmngr.c (isvalid_status_cb, lookup_status_cb)

Browse source 
(run_command_status_cb): Return cancel status if gpgsm_status
returned an error.

* server.c (gpgsm_status, gpgsm_status2)
(gpgsm_status_with_err_code): Return an error code.
(gpgsm_status2): Always call va_end().
This commit is contained in:
Werner Koch 2004-12-17 14:36:16 +00:00
parent 4350c58757
commit 0ccb120f68
4 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sm/call-dirmngr.c
View file

@ -355,7 +355,8 @@ isvalid_status_cb (void *opaque, const char *line)
{
for (line += 8; *line == ' '; line++)
;
gpgsm_status (parm->ctrl, STATUS_PROGRESS, line);
if (gpgsm_status (parm->ctrl, STATUS_PROGRESS, line))
return ASSUAN_Canceled;
}
}
else if (!strncmp (line, "ONLY_VALID_IF_CERT_VALID", 24)
@ -625,7 +626,8 @@ lookup_status_cb (void *opaque, const char *line)
{
for (line += 8; *line == ' '; line++)
;
gpgsm_status (parm->ctrl, STATUS_PROGRESS, line);
if (gpgsm_status (parm->ctrl, STATUS_PROGRESS, line))
return ASSUAN_Canceled;
}
}
else if (!strncmp (line, "TRUNCATED", 9) && (line[9]==' ' || !line[9]))
@ -760,7 +762,8 @@ run_command_status_cb (void *opaque, const char *line)
{
for (line += 8; *line == ' '; line++)
;
gpgsm_status (ctrl, STATUS_PROGRESS, line);
if (gpgsm_status (ctrl, STATUS_PROGRESS, line))
return ASSUAN_Canceled;
}
}
return 0;