Commit 100c43b8 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/web/14977-improve-openpgp-instructions' (Closes: #14685)

parents 30073782 28409eee
......@@ -1105,7 +1105,7 @@ Update the size of the ISO image in `inc/*`:
Generate the expected signature verification output:
LANG=C TZ=UTC gpg --no-options --verify "${ISO_PATH:?}.sig" "${ISO_PATH:?}" 2>&1 | \
LANG=C TZ=UTC gpg --no-options --keyid-format 0xlong --verify "${ISO_PATH:?}.sig" "${ISO_PATH:?}" 2>&1 | \
sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
"${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_gpg_signature_output.html"
......
gpg:&nbsp;Signature&nbsp;made&nbsp;Sat&nbsp;17&nbsp;Mar&nbsp;2018&nbsp;12:08:42&nbsp;AM&nbsp;UTC<br/>
gpg:&nbsp;Signature&nbsp;made&nbsp;Sat&nbsp;Mar&nbsp;17&nbsp;00:08:42&nbsp;2018&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/>
gpg --keyid-format 0xlong --verify tails-amd64-3.6.1.iso.sig tails-amd64-3.6.1.iso
gpg --no-options --keyid-format 0xlong --verify tails-amd64-3.6.1.iso.sig tails-amd64-3.6.1.iso
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