diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-21 15:03:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-21 15:03:15 -0800 |
| commit | d2f0b7275998ebeaa15e48ce0180c466e1d77ec4 (patch) | |
| tree | 9c78f0d3b6d3ba03fc9e6466f1f56fdc31443fcf /fmt-merge-msg.c | |
| parent | 3770c21be99a1e387794ec21e9bfeb3c640376b6 (diff) | |
| parent | 50992f96c546ebdc0c149660f6baa948739888d9 (diff) | |
Merge branch 'fs/ssh-signing-key-lifetime'
Extend the signing of objects with SSH keys and learn to pay
attention to the key validity time range when verifying.
* fs/ssh-signing-key-lifetime:
ssh signing: verify ssh-keygen in test prereq
ssh signing: make fmt-merge-msg consider key lifetime
ssh signing: make verify-tag consider key lifetime
ssh signing: make git log verify key lifetime
ssh signing: make verify-commit consider key lifetime
ssh signing: add key lifetime test prereqs
ssh signing: use sigc struct to pass payload
t/fmt-merge-msg: make gpgssh tests more specific
t/fmt-merge-msg: do not redirect stderr
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 5216191488..e4f7810be2 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -533,8 +533,9 @@ static void fmt_merge_msg_sigs(struct strbuf *out) else { buf = payload.buf; len = payload.len; - if (check_signature(payload.buf, payload.len, sig.buf, - sig.len, &sigc) && + sigc.payload_type = SIGNATURE_PAYLOAD_TAG; + sigc.payload = strbuf_detach(&payload, &sigc.payload_len); + if (check_signature(&sigc, sig.buf, sig.len) && !sigc.output) strbuf_addstr(&sig, "gpg verification failed.\n"); else |