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

sm: Use open_stream_nc for HANDLE by assuan_get_output_fd. 

* sm/server.c (cmd_encrypt): Use gnupg_fd_t for OUT_FD.
Call open_stream_nc with OUT_FD.
(cmd_decrypt, cmd_verify, cmd_sign, cmd_export): Likewise.

--

GnuPG-bug-id: 6580
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-07-13 11:18:47 +09:00
parent 23bcb78d27
commit fb046ccd93
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sm/server.c
View File

@ -451,7 +451,8 @@ cmd_encrypt (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
certlist_t cl; certlist_t cl;
int inp_fd, out_fd; int inp_fd;
gnupg_fd_t out_fd;
estream_t out_fp; estream_t out_fp;
int rc; int rc;
@ -460,11 +461,11 @@ cmd_encrypt (assuan_context_t ctx, char *line)
inp_fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0); inp_fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0);
if (inp_fd == -1) if (inp_fd == -1)
return set_error (GPG_ERR_ASS_NO_INPUT, NULL); return set_error (GPG_ERR_ASS_NO_INPUT, NULL);
out_fd = translate_sys2libc_fd (assuan_get_output_fd (ctx), 1); out_fd = assuan_get_output_fd (ctx);
if (out_fd == -1) if (out_fd == GNUPG_INVALID_FD)
return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL); return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
out_fp = es_fdopen_nc (out_fd, "w"); out_fp = open_stream_nc (out_fd, "w");
if (!out_fp) if (!out_fp)
return set_error (gpg_err_code_from_syserror (), "fdopen() failed"); return set_error (gpg_err_code_from_syserror (), "fdopen() failed");
@ -508,7 +509,8 @@ static gpg_error_t
cmd_decrypt (assuan_context_t ctx, char *line) cmd_decrypt (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
int inp_fd, out_fd; int inp_fd;
gnupg_fd_t out_fd;
estream_t out_fp; estream_t out_fp;
int rc; int rc;
@ -517,11 +519,11 @@ cmd_decrypt (assuan_context_t ctx, char *line)
inp_fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0); inp_fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0);
if (inp_fd == -1) if (inp_fd == -1)
return set_error (GPG_ERR_ASS_NO_INPUT, NULL); return set_error (GPG_ERR_ASS_NO_INPUT, NULL);
out_fd = translate_sys2libc_fd (assuan_get_output_fd (ctx), 1); out_fd = assuan_get_output_fd (ctx);
if (out_fd == -1) if (out_fd == GNUPG_INVALID_FD)
return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL); return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
out_fp = es_fdopen_nc (out_fd, "w"); out_fp = open_stream_nc (out_fd, "w");
if (!out_fp) if (!out_fp)
return set_error (gpg_err_code_from_syserror (), "fdopen() failed"); return set_error (gpg_err_code_from_syserror (), "fdopen() failed");
@ -554,7 +556,7 @@ cmd_verify (assuan_context_t ctx, char *line)
int rc; int rc;
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
int fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0); int fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0);
int out_fd = translate_sys2libc_fd (assuan_get_output_fd (ctx), 1); gnupg_fd_t out_fd = assuan_get_output_fd (ctx);
estream_t out_fp = NULL; estream_t out_fp = NULL;
(void)line; (void)line;
@ -562,9 +564,9 @@ cmd_verify (assuan_context_t ctx, char *line)
if (fd == -1) if (fd == -1)
return set_error (GPG_ERR_ASS_NO_INPUT, NULL); return set_error (GPG_ERR_ASS_NO_INPUT, NULL);
if (out_fd != -1) if (out_fd != GNUPG_INVALID_FD)
{ {
out_fp = es_fdopen_nc (out_fd, "w"); out_fp = open_stream_nc (out_fd, "w");
if (!out_fp) if (!out_fp)
return set_error (gpg_err_code_from_syserror (), "fdopen() failed"); return set_error (gpg_err_code_from_syserror (), "fdopen() failed");
} }
@ -594,7 +596,8 @@ static gpg_error_t
cmd_sign (assuan_context_t ctx, char *line) cmd_sign (assuan_context_t ctx, char *line)
{ {
ctrl_t ctrl = assuan_get_pointer (ctx); ctrl_t ctrl = assuan_get_pointer (ctx);
int inp_fd, out_fd; int inp_fd;
gnupg_fd_t out_fd;
estream_t out_fp; estream_t out_fp;
int detached; int detached;
int rc; int rc;
@ -602,13 +605,13 @@ cmd_sign (assuan_context_t ctx, char *line)
inp_fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0); inp_fd = translate_sys2libc_fd (assuan_get_input_fd (ctx), 0);
if (inp_fd == -1) if (inp_fd == -1)
return set_error (GPG_ERR_ASS_NO_INPUT, NULL); return set_error (GPG_ERR_ASS_NO_INPUT, NULL);
out_fd = translate_sys2libc_fd (assuan_get_output_fd (ctx), 1); out_fd = assuan_get_output_fd (ctx);
if (out_fd == -1) if (out_fd == GNUPG_INVALID_FD)
return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL); return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
detached = has_option (line, "--detached"); detached = has_option (line, "--detached");
out_fp = es_fdopen_nc (out_fd, "w"); out_fp = open_stream_nc (out_fd, "w");
if (!out_fp) if (!out_fp)
return set_error (GPG_ERR_ASS_GENERAL, "fdopen() failed"); return set_error (GPG_ERR_ASS_GENERAL, "fdopen() failed");
@ -756,15 +759,15 @@ cmd_export (assuan_context_t ctx, char *line)
} }
else else
{ {
int fd = translate_sys2libc_fd (assuan_get_output_fd (ctx), 1); gnupg_fd_t fd = assuan_get_output_fd (ctx);
estream_t out_fp; estream_t out_fp;
if (fd == -1) if (fd == GNUPG_INVALID_FD)
{ {
free_strlist (list); free_strlist (list);
return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL); return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
} }
out_fp = es_fdopen_nc (fd, "w"); out_fp = open_stream_nc (fd, "w");
if (!out_fp) if (!out_fp)
{ {
free_strlist (list); free_strlist (list);