diff --git a/contrib/verify-commits/allow-sha1-commits b/contrib/verify-commits/allow-sha1-commits deleted file mode 100644 index 95650029eb7..00000000000 --- a/contrib/verify-commits/allow-sha1-commits +++ /dev/null @@ -1 +0,0 @@ -aeaa67a9eac0decb89c60a67f9755ca10cbcc1d9 diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py index a0eaf8cdbc5..b053fbd1ffe 100755 --- a/contrib/verify-commits/verify-commits.py +++ b/contrib/verify-commits/verify-commits.py @@ -7,6 +7,7 @@ import argparse import hashlib import logging import os +from pathlib import Path import subprocess import sys import time @@ -80,22 +81,14 @@ def main(): args = parser.parse_args() # get directory of this program and read data files - dirname = os.path.dirname(os.path.abspath(__file__)) - print("Using verify-commits data from " + dirname) - with open(dirname + "/trusted-git-root", "r") as f: - verified_root = f.read().splitlines()[0] - with open(dirname + "/trusted-sha512-root-commit", "r") as f: - verified_sha512_root = f.read().splitlines()[0] - with open(dirname + "/allow-revsig-commits", "r") as f: - revsig_allowed = f.read().splitlines() - with open(dirname + "/allow-unclean-merge-commits", "r") as f: - unclean_merge_allowed = f.read().splitlines() - with open(dirname + "/allow-incorrect-sha512-commits", "r") as f: - incorrect_sha512_allowed = f.read().splitlines() - with open(dirname + "/trusted-keys", "r") as f: - trusted_keys = f.read().splitlines() - with open(dirname + "/allow-sha1-commits", "r") as f: - sha1_allowed = f.read().splitlines() + dirname = Path(__file__).absolute().parent + print(f"Using verify-commits data from {dirname}") + verified_root = (dirname / "trusted-git-root").read_text().splitlines()[0] + verified_sha512_root = (dirname / "trusted-sha512-root-commit").read_text().splitlines()[0] + revsig_allowed = (dirname / "allow-revsig-commits").read_text().splitlines() + unclean_merge_allowed = (dirname / "allow-unclean-merge-commits").read_text().splitlines() + incorrect_sha512_allowed = (dirname / "allow-incorrect-sha512-commits").read_text().splitlines() + trusted_keys = (dirname / "trusted-keys").read_text().splitlines() # Set commit and variables current_commit = args.commit @@ -138,8 +131,6 @@ def main(): os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1" - if current_commit in sha1_allowed: - os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "1" allow_revsig = current_commit in revsig_allowed # Check that the commit (and parents) was signed with a trusted key