security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

dirmngr: Fix API of functions wrt their error type. 

* dirmngr/crlcache.h (fakecrl_isvalid): Fix return type.
* dirmngr/http.c (parse_response): Fix return type to gpg_error_t,
modifying the function implementation.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-05-01 11:39:24 +09:00
parent 698caf30b9
commit 0fe99d69f0
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dirmngr/crlcache.h
View File

@ -70,9 +70,9 @@ gpg_error_t crl_cache_reload_crl (ctrl_t ctrl, ksba_cert_t cert);
/*-- fakecrl.c --*/
crl_cache_result_t fakecrl_isvalid (ctrl_t ctrl,
const char *issuer_hash,
const char *cert_id);
gpg_error_t fakecrl_isvalid (ctrl_t ctrl,
const char *issuer_hash,
const char *cert_id);

14
dirmngr/http.c
View File

@ -2555,7 +2555,7 @@ http_get_header_names (http_t hd)
* Parse the response from a server.
* Returns: Errorcode and sets some files in the handle
*/
static gpg_err_code_t
static gpg_error_t
parse_response (http_t hd)
{
char *line, *p, *p2;
@ -2579,11 +2579,11 @@ parse_response (http_t hd)
len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen);
line = hd->buffer;
if (!line)
return gpg_err_code_from_syserror (); /* Out of core. */
return gpg_error_from_syserror (); /* Out of core. */
if (!maxlen)
return GPG_ERR_TRUNCATED; /* Line has been truncated. */
return gpg_error (GPG_ERR_TRUNCATED); /* Line has been truncated. */
if (!len)
return GPG_ERR_EOF;
return gpg_error (GPG_ERR_EOF);
if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
log_debug_string (line, "http.c:response:\n");
@ -2623,10 +2623,10 @@ parse_response (http_t hd)
len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen);
line = hd->buffer;
if (!line)
return gpg_err_code_from_syserror (); /* Out of core. */
return gpg_error_from_syserror (); /* Out of core. */
/* Note, that we can silently ignore truncated lines. */
if (!len)
return GPG_ERR_EOF;
return gpg_error (GPG_ERR_EOF);
/* Trim line endings of empty lines. */
if ((*line == '\r' && line[1] == '\n') || *line == '\n')
*line = 0;
@ -2637,7 +2637,7 @@ parse_response (http_t hd)
{
gpg_err_code_t ec = store_header (hd, line);
if (ec)
return ec;
return gpg_error (ec);
}
}
while (len && *line);