From ff5f2bacef756b3010b62dfecf19b61f73f6259f Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 29 May 2020 21:21:01 +0100 Subject: [PATCH] Ensure that zero-leading gpg key IDs verify Fix #10591 Signed-off-by: Andrew Thornton --- models/gpg_key.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/gpg_key.go b/models/gpg_key.go index bebd33191aa13..fe07f2c2a5df5 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -609,10 +609,10 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification { keyID := "" if sig.IssuerKeyId != nil && (*sig.IssuerKeyId) != 0 { - keyID = fmt.Sprintf("%X", *sig.IssuerKeyId) + keyID = fmt.Sprintf("%016X", *sig.IssuerKeyId) } if keyID == "" && sig.IssuerFingerprint != nil && len(sig.IssuerFingerprint) > 0 { - keyID = fmt.Sprintf("%X", sig.IssuerFingerprint[12:20]) + keyID = fmt.Sprintf("%016X", sig.IssuerFingerprint[12:20]) } defaultReason := NoKeyFound