averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fs/ssh-signing' into fs/ssh-signing-fix

Browse Source 
* fs/ssh-signing:
  ssh signing: test that gpg fails for unknown keys
  ssh signing: tests for logs, tags & push certs
  ssh signing: duplicate t7510 tests for commits
  ssh signing: verify signatures using ssh-keygen
  ssh signing: provide a textual signing_key_id
  ssh signing: retrieve a default key from ssh-agent
  ssh signing: add ssh key format and signing code
  ssh signing: add test prereqs
  ssh signing: preliminary refactoring and clean-up
This commit is contained in:
Junio C Hamano
2021-10-12 10:35:19 -07:00
parent 2a97289ad8 1bfb57f642
commit e8191a5265
15 changed files with 1341 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fmt-merge-msg.c
View File

@@ -528,11 +528,11 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
buf = payload.buf;
len = payload.len;
if (check_signature(payload.buf, payload.len, sig.buf,
sig.len, &sigc) &&
!sigc.gpg_output)
sig.len, &sigc) &&
!sigc.output)
strbuf_addstr(&sig, "gpg verification failed.\n");
else
strbuf_addstr(&sig, sigc.gpg_output);
strbuf_addstr(&sig, sigc.output);
}
signature_check_clear(&sigc);