summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-08-20 10:33:58 +0000
committersajolida <sajolida@pimienta.org>2018-08-20 10:33:58 +0000
commitab1c955659886da4e9068568b130a935d0db2981 (patch)
treef77939776478782cdf7c08fdf0670baa334646ff
parent51ee8fff10d6478d9bd2f7d55af36ba1d29e83e6 (diff)
Download the OpenPGP signature for either the ISO image or the USB image
For simplicity, I'm assuming here that it's fine to then call it "the image", without specifying "ISO" or "USB" for this audience.
-rw-r--r--wiki/src/inc/stable_amd64_img_gpg_signature_output.html (renamed from wiki/src/inc/stable_amd64_gpg_signature_output.html)0
-rw-r--r--wiki/src/inc/stable_amd64_img_gpg_verify.html1
-rw-r--r--wiki/src/inc/stable_amd64_iso_gpg_signature_output.html4
-rw-r--r--wiki/src/inc/stable_amd64_iso_gpg_verify.html (renamed from wiki/src/inc/stable_amd64_gpg_verify.html)0
-rw-r--r--wiki/src/install/inc/screenshots/notification_in_tails.pngbin5516 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.pngbin0 -> 6678 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.pngbin0 -> 6495 bytes
-rw-r--r--wiki/src/install/inc/steps/download.inline.html32
8 files changed, 23 insertions, 14 deletions
diff --git a/wiki/src/inc/stable_amd64_gpg_signature_output.html b/wiki/src/inc/stable_amd64_img_gpg_signature_output.html
index f3ffcff..f3ffcff 100644
--- a/wiki/src/inc/stable_amd64_gpg_signature_output.html
+++ b/wiki/src/inc/stable_amd64_img_gpg_signature_output.html
diff --git a/wiki/src/inc/stable_amd64_img_gpg_verify.html b/wiki/src/inc/stable_amd64_img_gpg_verify.html
new file mode 100644
index 0000000..5b00d8c
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_img_gpg_verify.html
@@ -0,0 +1 @@
+gpg --no-options --keyid-format 0xlong --verify tails-amd64-3.8.img.sig tails-amd64-3.8.img
diff --git a/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html b/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html
new file mode 100644
index 0000000..f3ffcff
--- /dev/null
+++ b/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html
@@ -0,0 +1,4 @@
+gpg:&nbsp;Signature&nbsp;made&nbsp;Mon&nbsp;25&nbsp;Jun&nbsp;2018&nbsp;11:14:47&nbsp;AM&nbsp;UTC<br/>
+gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;EDDSA&nbsp;key&nbsp;CD4D4351AFA6933F574A9AFB90B2B4BD7AED235F<br/>
+gpg:&nbsp;Good&nbsp;signature&nbsp;from&nbsp;"Tails&nbsp;developers&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
+gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;aka&nbsp;"Tails&nbsp;developers&nbsp;(offline&nbsp;long-term&nbsp;identity&nbsp;key)&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
diff --git a/wiki/src/inc/stable_amd64_gpg_verify.html b/wiki/src/inc/stable_amd64_iso_gpg_verify.html
index 6a4d744..6a4d744 100644
--- a/wiki/src/inc/stable_amd64_gpg_verify.html
+++ b/wiki/src/inc/stable_amd64_iso_gpg_verify.html
diff --git a/wiki/src/install/inc/screenshots/notification_in_tails.png b/wiki/src/install/inc/screenshots/notification_in_tails.png
deleted file mode 100644
index 5c0b291..0000000
--- a/wiki/src/install/inc/screenshots/notification_in_tails.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.png b/wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.png
new file mode 100644
index 0000000..7d608f6
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.png b/wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.png
new file mode 100644
index 0000000..0a79fc9
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.png
Binary files differ
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index e5b3d6a..b8c879b 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -299,10 +299,11 @@ BitTorrent.</p>
</li>
<li>
- <p>Download the <a href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>
- Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] OpenPGP signature</a>
+ <p>Download the
+ <a class="debian windows linux mac-usb upgrade-tails" 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="mac-dvd dvd vm" 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 ISO image.</p>
+ you saved the image.</p>
</li>
</ol>
@@ -340,7 +341,7 @@ Signed on ... by tails@boum.org (Key ID: 0x58ACD84F
The validity of the signature cannot be verified.
</pre>
-<p>Then the ISO image is still correct according to the signing key that you
+<p>Then the image is still correct according to the signing key that you
downloaded. To remove this warning you need to <a href="#wot">authenticate the
signing key through the OpenPGP Web of Trust</a>.</p>
@@ -351,11 +352,11 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<ol>
<li>
Open <span class="application">Finder</span> and navigate to the
- folder where you saved the ISO image and the signature.
+ folder where you saved the image and the signature.
</li>
<li>
- Right-click on the ISO image and choose
+ Right-click on the image and choose
<span class="guimenuchoice">
<span class="guisubmenu">Services</span> ▸
<span class="guimenuitem">OpenPGP: Verify Signature of File</span></span>.
@@ -369,7 +370,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<ol>
<li>
Open the file browser and navigate to the folder where you saved the
- ISO image and the signature.
+ image and the signature.
</li>
<li>
@@ -378,7 +379,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
</li>
<li>
- The verification of the ISO image starts automatically:
+ The verification of the image starts automatically:
<p>[[!img install/inc/screenshots/verifying_in_tails.png link="no"]]</p>
</li>
@@ -387,7 +388,8 @@ signing key through the OpenPGP Web of Trust</a>.</p>
After the verification finishes, you should see a notification that the
signature is good:
- <p>[[!img install/inc/screenshots/notification_in_tails.png link="no"]]</p>
+ <p class="debian windows linux mac-usb upgrade-tails">[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="no"]]</p>
+ <p class="mac-dvd dvd vm">[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="no"]]</p>
<p>Verify that the date of the signature is at most five days earlier
than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>
@@ -401,18 +403,20 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<ol>
<li>
- Open a terminal and navigate to the folder where you saved the ISO
+ Open a terminal and navigate to the folder where you saved the
image and the signature.
</li>
<li>
<p>Execute:</p>
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_verify" raw="yes" sort="age"]]</p>
+ <p class="debian windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
+ <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
<p>The output of this command should be the following:</p>
- <p class="pre">[[!inline pages="inc/stable_amd64_gpg_signature_output" raw="yes" sort="age"]]</p>
+ <p class="debian windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
+ <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
<p>Verify that the date of the signature is at most five days
earlier than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>
@@ -424,7 +428,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
gpg: There is no indication that the signature belongs to the owner.<br/>
</p>
- <p>Then the ISO image is still correct according to the signing key that you
+ <p>Then the image is still correct according to the signing key that you
downloaded. To remove this warning you need to <a href="#wot">authenticate
the signing key through the OpenPGP Web of Trust</a>.</p>
</li>
@@ -470,7 +474,7 @@ through the OpenPGP Web of Trust.</p>
<div class="note">
-<p>If you are verifying an ISO image from inside Tails, for
+<p>If you are verifying an image from inside Tails, for
example, to do a manual upgrade, then you already have the Tails signing key.
You can trust this signing key as much as you already trust your
Tails installation since this signing key is included in your Tails