Skip to content

Commit 4d81df4

Browse files
committed
Contact & Announcements: replace GPG key links with fingerprints
1 parent 9786d4a commit 4d81df4

File tree

4 files changed

+38
-4
lines changed

4 files changed

+38
-4
lines changed

_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+
{% assign _includes_dev_keys-import = "You can import a key by running the following command with that individual's fingerprint: `gpg --recv-keys <fingerprint>`" %}
12+
{% endcase %}
13+
{% endcapture %}
14+
15+
| {{_includes_dev_keys-name}} | {{_includes_dev_keys-fingerprint}} |
16+
|-----------------------------|--------------------------------------------|
17+
| Wladimir van der Laan | `71A3B16735405025D447E8F274810B012346C9A6` |
18+
| Jonas Schnelli | `32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC` |
19+
| Pieter Wuille | `133EAC179436F14A5CF1B794860FEB804E669320` |
20+
21+
{{_includes_dev_keys-import}}

_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)