diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-30 12:26:28 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-30 12:28:37 +0200 |
| commit | ff48f6267128fea636d6edfe39f2b44494c7246d (patch) | |
| tree | 804a330ca8dd20a804381dc4909cfb121947ebd4 /contrib/verify-commits/trusted-git-root | |
| parent | 3b62a913865777426c11992bae622fb48aa72a40 (diff) | |
| parent | 94715767a33c90ef06dea4f25e2733fa20fa0f36 (diff) | |
Merge #12822: Revert 7deba93bdc76616011a9f493cbc203d60084416f and fix expired-key-sigs properly
9471576 [verify-commits] Add some additional useful documentation. (Matt Corallo)
de7e931 Add Marco-expired-key-signed-commits to allow-revsig-commits (Matt Corallo)
99f6d48 Revert "test: Update trust git root". (Matt Corallo)
Pull request description:
7deba93bdc76616011a9f493cbc203d60084416f was took the wrong approach to updating verify-commits for a key expiration. Namely, adding each commit to allow-revsig-commits should have been done instead, allowing them to still be validated, but with the expired key.
Tree-SHA512: 9fdc67eda8f6daa95082f6c1a2af81beb730a9ff3f8cf930bb2311fe29b5f05e1f89259aba5f112153ca2e9c62577cf60d31b4c8e9ac1bf3f5506e78f8401378
Diffstat (limited to 'contrib/verify-commits/trusted-git-root')
| -rw-r--r-- | contrib/verify-commits/trusted-git-root | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/verify-commits/trusted-git-root b/contrib/verify-commits/trusted-git-root index e560b98d02..c60f8ab695 100644 --- a/contrib/verify-commits/trusted-git-root +++ b/contrib/verify-commits/trusted-git-root @@ -1 +1 @@ -11049f4fe62606d1b0380a9ef800ac130f0fbadf +82bcf405f6db1d55b684a1f63a4aabad376cdad7 |