Commit 6c17a3d5 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'cbrownstein/doc/16175-unclear-openpgp-verification' into doc/16175-unclear-openpgp-verification
parents 6a300711 3faa6c21
......@@ -302,19 +302,11 @@
OpenPGP signature instead of, or in addition to, our browser extension or
BitTorrent.</p>
<ol>
<li>
<p>Download and import the [[Tails signing key|tails-signing.key]].</p>
</li>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
</li>
</ol>
<p>Download the
<a class="windows linux mac upgrade-tails download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
<h3>Basic OpenPGP verification</h3>
......@@ -336,6 +328,12 @@ BitTorrent.</p>
<h3>In Windows with <span class="application">Gpg4win</span></h3>
<p>Download the [[Tails signing key|tails-signing.key]] and import it into
<span class="application">Gpg4win</span>.</p>
<p>See the [[<span class="application">Gpg4win</span> documentation on
importing keys|https://www.gpg4win.org/doc/en/gpg4win-compendium_15.html]].</p>
<p>See the [[<span class="application">Gpg4win</span> documentation on
verifying signatures|http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]].</p>
......@@ -359,6 +357,12 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<h3>In macOS using <span class="application">GPGTools</span></h3>
<ol>
<li>
<p>Download the [[Tails signing key|tails-signing.key]] and import it into
<span class="application">GPGTools</span>.</p>
<p>See the [[<span class="application">GPGTools</span> documentation on
importing keys|https://gpgtools.tenderapp.com/kb/gpg-keychain-faq/how-to-find-public-keys-of-your-friends-and-import-them#import-key-file]].</p>
</li>
<li>
Open <span class="application">Finder</span> and navigate to the
folder where you saved the image and the signature.
......@@ -376,6 +380,8 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<h3>In Tails</h3>
<p>Tails comes with the Tails signing key already imported.</p>
<ol>
<li>
Open the file browser and navigate to the folder where you saved the
......@@ -409,10 +415,23 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<h3>Using the command line</h3>
<ol>
<li>
Open a terminal and navigate to the folder where you saved the
<p>Download the [[Tails signing key|tails-signing.key]] and import it into
<span class="application">GnuPGP</span>.</p>
<p>To import the Tails signing key into
<span class="application">GnuPGP</span>, open a terminal and navigate to
the folder where you saved the Tails signing key.</p>
<p>Execute:</p>
<p class="pre">gpg --import tails-signing.key</p>
</li>
<li>
In a terminal, navigate to the folder where you saved the
image and the signature.
</li>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment