aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inside-gentoo/developers/index.html2
-rw-r--r--support/security/index.html6
-rw-r--r--support/security/vulnerability-treatment-policy.html6
3 files changed, 7 insertions, 7 deletions
diff --git a/inside-gentoo/developers/index.html b/inside-gentoo/developers/index.html
index 4f143c5..18a827a 100644
--- a/inside-gentoo/developers/index.html
+++ b/inside-gentoo/developers/index.html
@@ -33,7 +33,7 @@ layout: page-nav3
<table class="table table-striped">
<tr>
<th>Username</th>
- <th>GPG key(s)</th>
+ <th>OpenPGP key(s)</th>
<th>Location</th>
<th>Roles</th>
</tr>
diff --git a/support/security/index.html b/support/security/index.html
index d1f4f98..e984c8a 100644
--- a/support/security/index.html
+++ b/support/security/index.html
@@ -94,7 +94,7 @@ layout: page-nav3
<td class="infohead"><b>Name</b></td>
<td class="infohead"><b>Responsibility</b></td>
<td class="infohead"><b>Email</b></td>
- <td class="infohead"><b>GPG key ID (click to retrieve public key)</b></td>
+ <td class="infohead"><b>OpenPGP key ID (click to retrieve public key)</b></td>
</tr>
<tr>
<td class="tableinfo">Yury German</td>
@@ -118,7 +118,7 @@ layout: page-nav3
<div class="alert alert-info">
<strong>Note:</strong>
- You can see a full list of Gentoo developers, including their GPG key ID on our <a href="/inside-gentoo/developers/">list of active developers</a>.
+ You can see a full list of Gentoo developers, including their OpenPGP key ID on our <a href="/inside-gentoo/developers/">list of active developers</a>.
</div>
<h2>Resources</h2>
@@ -135,5 +135,5 @@ layout: page-nav3
<ul>
<li><a href="https://wiki.gentoo.org/wiki/Security_Handbook">Gentoo Security Handbook</a> — Step-by-step guide for hardening Gentoo Linux.</li>
<li><a href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo Hardened Project</a> — Bringing advanced security to Gentoo Linux.</li>
- <li><a href="/inside-gentoo/developers/">Active Developer List</a> — Active developer list including GPG keys which can be used to verify GLSAs.</li>
+ <li><a href="/inside-gentoo/developers/">Active Developer List</a> — Active developer list including OpenPGP keys which can be used to verify GLSAs.</li>
</ul>
diff --git a/support/security/vulnerability-treatment-policy.html b/support/security/vulnerability-treatment-policy.html
index e8fae01..52410b1 100644
--- a/support/security/vulnerability-treatment-policy.html
+++ b/support/security/vulnerability-treatment-policy.html
@@ -85,7 +85,7 @@ body_class: nav-align-h2
<div class="alert alert-info">
<strong>Note:</strong>
Communication for confidential vulnerabilities should be properly encrypted.
- They should be sent to specific Security Team members and encrypted with their GPG key.
+ They should be sent to specific Security Team members and encrypted with their OpenPGP key.
The list of the Security Team members is available on the <a href="https://wiki.gentoo.org/wiki/Project:Security">project page</a>,
their key IDs can be looked up on the <a href="/inside-gentoo/developers/">Gentoo Linux Developers List</a>
and their keys can be retrieved from the <a href="http://subkeys.pgp.net:11371">subkeys.pgp.net</a> keyserver.
@@ -365,12 +365,12 @@ You can use the following two tables to help you assign the severity level:
<li>The <code>From:</code> and <code>Return-Path:</code> must be set to the GLSA coordinator @gentoo.org address</li>
<li>The <code>Subject:</code> field must be "[ GLSA XXXXYY-ZZ ] Your vulnerability here"</li>
<li>The body should only contain the text version of the GLSA</li>
- <li>The email must be signed by the GLSA coordinator GPG key</li>
+ <li>The email must be signed by the GLSA coordinator OpenPGP key</li>
</ul>
<div class="alert alert-info">
<strong>Notes:</strong><br>
- Developer key IDs can be found in the Gentoo Linux <a href="/inside-gentoo/developers/">Developer list</a>. All the security team GPG keys are published on public key servers, including (but not limited to) <a href="http://subkeys.pgp.net:11371">subkeys.pgp.net</a>.<br>
+ Developer key IDs can be found in the Gentoo Linux <a href="/inside-gentoo/developers/">Developer list</a>. All the security team OpenPGP keys are published on public key servers, including (but not limited to) <a href="http://subkeys.pgp.net:11371">subkeys.pgp.net</a>.<br>
To minimize errors in the publication process, the forum publication step is handled by an automatic poster when it receives the announcement.<br>