From f20e664f40be331012811128ce6ab5b0a6bdd8ba Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 6 Mar 2017 16:13:40 -0500
Subject: [PATCH] Check gpg version before setting --weak-digest

---
 contrib/verify-commits/gpg.sh            | 18 +++++++++++++++---
 contrib/verify-commits/verify-commits.sh |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index 4342d7bd0f6ec..b01e2a6d39e5a 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -19,8 +19,20 @@ else
 	# an attacker could construct a pull-req that results in a commit object that
 	# they've created a collision for. Not the most likely attack, but preventing
 	# it is pretty easy so we do so as a "belt-and-suspenders" measure.
-
-	GPG_RES="$(echo "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null)"
+	GPG_RES=""
+	for LINE in "$(gpg --version)"; do
+		case "$LINE" in
+			"gpg (GnuPG) 1.4.1"*|"gpg (GnuPG) 2.0."*)
+				echo "Please upgrade to at least gpg 2.1.10 to check for weak signatures" > /dev/stderr
+				GPG_RES="$(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)"
+				;;
+			# We assume if you're running 2.1+, you're probably running 2.1.10+
+			# gpg will fail otherwise
+			# We assume if you're running 1.X, it is either 1.4.1X or 1.4.20+
+			# gpg will fail otherwise
+		esac
+	done
+	[ "$GPG_RES" = "" ] && GPG_RES="$(echo "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null)"
 fi
 for LINE in $(echo "$GPG_RES"); do
 	case "$LINE" in
@@ -40,7 +52,7 @@ if ! $VALID; then
 	exit 1
 fi
 if $VALID && $REVSIG; then
-	echo "$INPUT" | gpg --trust-model always "$@" | grep "\[GNUPG:\] \(NEWSIG\|SIG_ID\|VALIDSIG\)" 2>/dev/null
+	echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null | grep "\[GNUPG:\] \(NEWSIG\|SIG_ID\|VALIDSIG\)"
 	echo "$GOODREVSIG"
 else
 	echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh
index 55eccf588a50b..cbf59aba946a1 100755
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -43,7 +43,7 @@ IS_SIGNED () {
 		export BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG=0
 	fi
 
-	if ! git -c "gpg.program=${DIR}/gpg.sh" verify-commit $1 > /dev/null 2>&1; then
+	if ! git -c "gpg.program=${DIR}/gpg.sh" verify-commit $1 > /dev/null; then
 		return 1;
 	fi