Skip to content

Commit 9cdd84e

Browse files
committed
Merge #550: Contact & Announcement List pages: update GPG key links & provide fingerprints
88adc3d Key fingerprints: display in GPG style (David A. Harding) 54f95ce References: link to pgp.mit.edu for developer keys (David A. Harding) 4d81df4 Contact & Announcements: replace GPG key links with fingerprints (David A. Harding) Pull request description: Closes #543 ; CC: @kallerosenbaum Updated bottom section on Announcement list page looks like: ![2018-05-02-13_32_45_132722580](https://user-images.githubusercontent.com/61096/39539363-63c50794-4e0d-11e8-873b-03a7a2f06149.png) --- New bottom section on updated Contact page looks like: ![2018-05-02-13_33_48_991944438](https://user-images.githubusercontent.com/61096/39539396-7d1737e4-4e0d-11e8-851d-37716187c6d9.png) --- Translations of the two pages don't have any text changed, but the links for the three keys are redirected to the pgp.mit.edu keyserver web interface as suggested in the corresponding issues (pgp.mit.edu is slow, but at least it doesn't 404). When those pages are re-translated with the updated content, we can remove the old links directly to the keys. I obtained the key fingerprints from [here](https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-keys/keys.txt) but haven't otherwise validated them, so somebody who has checked them should probably review this PR. Tree-SHA512: e1b7d71666221f8e0d9d7b8808053480fcb5aaef5e1e11a9e295ed6cefb4e5a8cf3216f214a73ca087ddab08766567b7e0c0c8891ab4a5784b8aecde93e7e843
2 parents 6df75e0 + 88adc3d commit 9cdd84e

File tree

6 files changed

+42
-7
lines changed

6 files changed

+42
-7
lines changed

_includes/_references.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@
116116
[slack-invite]: https://slack.bitcoincore.org/
117117
[software life cycle]: /en/lifecycle
118118

119-
[laanwj-key]: https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-keys/laanwj-key.pgp
120-
[jonasschnelli-key]: https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-keys/jonasschnelli-key.pgp
121-
[sipa-key]: https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-keys/sipa-key.pgp
119+
[laanwj-key]: https://pgp.mit.edu/pks/lookup?op=get&search=0x71A3B16735405025D447E8F274810B012346C9A6
120+
[jonasschnelli-key]: https://pgp.mit.edu/pks/lookup?op=get&search=0x32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC
121+
[sipa-key]: https://pgp.mit.edu/pks/lookup?op=get&search=0x133EAC179436F14A5CF1B794860FEB804E669320
122122

123123
[recent-contributors]: https://github.com/bitcoin/bitcoin/graphs/contributors?from=2017-03-01
124124

_includes/dev-keys.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{% capture /dev/null %}
2+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
3+
!!! NB: for this file to render correctly, !!!
4+
!!! you must also include _references.md !!!
5+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
6+
7+
{% case page.lang %}
8+
{% else %}{% comment %}fallback to English{% endcomment %}
9+
{% assign _includes_dev_keys-name = "Name" %}
10+
{% assign _includes_dev_keys-fingerprint = "Fingerprint" %}
11+
{% capture _includes_dev_keys-import %}You can import a key by running the following command with that individual's fingerprint: `gpg --recv-keys "<fingerprint>"` Ensure that you put quotes around fingerprints containing spaces.{% endcapture %}
12+
{% endcase %}
13+
{% endcapture %}
14+
15+
| {{_includes_dev_keys-name}} | {{_includes_dev_keys-fingerprint}} |
16+
|-----------------------------|--------------------------------------------|
17+
| Wladimir van der Laan | <code>{% include fingerprint-split.html hex="71A3B16735405025D447E8F274810B012346C9A6" %}</code> |
18+
| Jonas Schnelli | <code>{% include fingerprint-split.html hex="32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC" %}</code> |
19+
| Pieter Wuille | <code>{% include fingerprint-split.html hex="133EAC179436F14A5CF1B794860FEB804E669320" %}</code> |
20+
21+
{{_includes_dev_keys-import}}

_includes/fingerprint-split.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{include.hex | slice: 0, 4 }}&nbsp;{{include.hex | slice: 4, 4 }}&nbsp;{{include.hex | slice: 8, 4 }}&nbsp;{{include.hex | slice: 12, 4 }}&nbsp;{{include.hex | slice: 16, 4 }}&nbsp;&nbsp;{{include.hex | slice: 20, 4 }}&nbsp;{{include.hex | slice: 24, 4 }}&nbsp;{{include.hex | slice: 28, 4 }}&nbsp;{{include.hex | slice: 32, 4 }}&nbsp;{{include.hex | slice: 36, 4 }}

_posts/en/pages/2016-03-12-contact.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,11 @@ You can find Bitcoin Core developers on <i class="fa fa-fw fa-slack"></i> [Slack
2222

2323
To report issue about this website please use the [website][website-issues] issue tracker.
2424

25+
## GPG keys
26+
27+
The following keys may be used to communicate sensitive information to
28+
developers:
29+
30+
{% include dev-keys.md %}
31+
2532
{% include _references.md %}

_posts/en/pages/list/2016-03-10-announcements-join.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ type: pages
66
layout: page
77
lang: en
88
share: false
9-
version: 1
9+
version: 2
1010
---
1111
Receive notification of important security announcements and releases for Bitcoin Core.
1212

@@ -16,6 +16,9 @@ Enter your email address below:
1616

1717
Low traffic for announcements only.
1818

19-
_Emails will be GPG signed by [Wladimir van der Laan][laanwj-key], [Jonas Schnelli][jonasschnelli-key] or [Pieter Wuille][sipa-key] and DKIM signed from bitcoincore.org_.
19+
Emails will be DKIM signed from bitcoincore.org and GPG signed by one of
20+
the following keys:
21+
22+
{% include dev-keys.md %}
2023

2124
{% include _references.md %}

_posts/en/posts/2016-03-15-announcelist.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lang: en
55
id: en-announce-list
66
name: announce-list
77
tags: [bitcoin, bitcoin core, announcement list, updates]
8-
version: 1
8+
version: 2
99
---
1010
In an effort to increase communications, we are launching an opt-in, _announcement-only_ mailing-list for users of Bitcoin Core to receive notifications of security issues and new releases.
1111

@@ -15,6 +15,9 @@ To subscribe, enter your email address below:
1515

1616
{% include pages/list/announcement.html %}
1717

18-
_Emails will be GPG signed by [Wladimir van der Laan][laanwj-key], [Jonas Schnelli][jonasschnelli-key] or [Pieter Wuille][sipa-key] and DKIM signed from bitcoincore.org._
18+
Emails will be DKIM signed from bitcoincore.org and GPG signed by one of
19+
the following keys:
20+
21+
{% include dev-keys.md %}
1922

2023
{% include _references.md %}

0 commit comments

Comments
 (0)