mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-21 15:50:07 +01:00
contrib: Revert "verify-commits sha1 exceptions"
This reverts commit 8ac134be5e, because it
is no longer needed.
This commit is contained in:
@@ -1 +0,0 @@
|
||||
aeaa67a9eac0decb89c60a67f9755ca10cbcc1d9
|
||||
@@ -94,8 +94,6 @@ def main():
|
||||
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()
|
||||
|
||||
# Set commit and variables
|
||||
current_commit = args.commit
|
||||
@@ -138,8 +136,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
|
||||
|
||||
Reference in New Issue
Block a user