undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/ssh-sign-report-errors' into maint-2.38

Browse Source 
The codepath to sign learned to report errors when it fails to read
from "ssh-keygen".

* pw/ssh-sign-report-errors:
  ssh signing: return an error when signature cannot be read
This commit is contained in:
Junio C Hamano 2022-10-25 17:11:35 -07:00
commit 48b754ddc0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gpg-interface.c
View File

@ -1059,12 +1059,11 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
strbuf_addbuf(&ssh_signature_filename, &buffer_file->filename); strbuf_addbuf(&ssh_signature_filename, &buffer_file->filename);
strbuf_addstr(&ssh_signature_filename, ".sig"); strbuf_addstr(&ssh_signature_filename, ".sig");
if (strbuf_read_file(signature, ssh_signature_filename.buf, 0) < 0) { if (strbuf_read_file(signature, ssh_signature_filename.buf, 0) < 0) {
error_errno( ret = error_errno(
_("failed reading ssh signing data buffer from '%s'"), _("failed reading ssh signing data buffer from '%s'"),
ssh_signature_filename.buf); ssh_signature_filename.buf);
goto out;
} }
unlink_or_warn(ssh_signature_filename.buf);
/* Strip CR from the line endings, in case we are on Windows. */ /* Strip CR from the line endings, in case we are on Windows. */
remove_cr_after(signature, bottom); remove_cr_after(signature, bottom);
@ -1073,6 +1072,8 @@ out:
delete_tempfile(&key_file); delete_tempfile(&key_file);
if (buffer_file) if (buffer_file)
delete_tempfile(&buffer_file); delete_tempfile(&buffer_file);
if (ssh_signature_filename.len)
unlink_or_warn(ssh_signature_filename.buf);
strbuf_release(&signer_stderr); strbuf_release(&signer_stderr);
strbuf_release(&ssh_signature_filename); strbuf_release(&ssh_signature_filename);
FREE_AND_NULL(ssh_signing_key_file); FREE_AND_NULL(ssh_signing_key_file);