]> git.ipfire.org Git - thirdparty/git.git/commit - gpg-interface.c
gpg-interface: prefer check_signature() for GPG verification
authorHans Jerry Illikainen <hji@dyntopia.com>
Wed, 4 Mar 2020 11:48:04 +0000 (11:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 Mar 2020 16:46:28 +0000 (09:46 -0700)
commit67948981983b336eab2fa7e6a0e125d529391dfc
tree6365d127be157a4ae8061186e0a156cce7497014
parentf1e3df316992d32b17ee27385e4c644ef7b66cc1
gpg-interface: prefer check_signature() for GPG verification

This commit refactors the use of verify_signed_buffer() outside of
gpg-interface.c to use check_signature() instead.  It also turns
verify_signed_buffer() into a file-local function since it's now only
invoked internally by check_signature().

There were previously two globally scoped functions used in different
parts of Git to perform GPG signature verification:
verify_signed_buffer() and check_signature().  Now only
check_signature() is used.

The verify_signed_buffer() function doesn't guard against duplicate
signatures as described by Michał Górny [1].  Instead it only ensures a
non-erroneous exit code from GPG and the presence of at least one
GOODSIG status field.  This stands in contrast with check_signature()
that returns an error if more than one signature is encountered.

The lower degree of verification makes the use of verify_signed_buffer()
problematic if callers don't parse and validate the various parts of the
GPG status message themselves.  And processing these messages seems like
a task that should be reserved to gpg-interface.c with the function
check_signature().

Furthermore, the use of verify_signed_buffer() makes it difficult to
introduce new functionality that relies on the content of the GPG status
lines.

Now all operations that does signature verification share a single entry
point to gpg-interface.c.  This makes it easier to propagate changed or
additional functionality in GPG signature verification to all parts of
Git, without having odd edge-cases that don't perform the same degree of
verification.

[1] https://dev.gentoo.org/~mgorny/articles/attack-on-git-signature-verification.html

Signed-off-by: Hans Jerry Illikainen <hji@dyntopia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fmt-merge-msg.c
gpg-interface.c
gpg-interface.h
log-tree.c