Email Self-Defense - a guide to fighting surveillance with GnuPG encryption

From: Ineiev Date: Sun, 30 Sep 2018 10:46:41 +0000 (+0000) Subject: Validation fixes. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=360881f189a53ca76b17578a1864123c1b719a65;p=enc.git Validation fixes. --- diff --git a/en/confirmation.html b/en/confirmation.html index 23a21d2e..b2c2d6b6 100644 --- a/en/confirmation.html +++ b/en/confirmation.html @@ -4,7 +4,8 @@ Email Self-Defense - a guide to fighting surveillance with GnuPG encryption - + @@ -15,6 +16,7 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" /> +

Please check your email for a confirmation link now. Thanks for @@ -72,8 +74,8 @@ href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version), and the rest of it is under a Creative Commons Attribution-ShareAlike 4.0 license (or later version). Download the source -code of Edward reply bot by Andrew Engelbrecht +href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz"> +source code of Edward reply bot by Andrew Engelbrecht <sudoman@ninthfloor.org> and Josh Drake <zamnedix@gnu.org>, available under the GNU Affero General Public License. Why these @@ -105,12 +107,14 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" />

- - + + - +--> + - diff --git a/en/index.html b/en/index.html index a72789e1..9e0f8018 100644 --- a/en/index.html +++ b/en/index.html @@ -51,26 +51,18 @@ style="color: #2F5FAA;">Translate!

Share -Teach your friends

+Share + - - - -

+ @@ -213,16 +205,12 @@ page.

@@ -232,7 +220,8 @@ alt="Step 1.B: Install Add-ons" />

Step 1.b Install the Enigmail plugin for your email program

In your email program's menu, select Add-ons (it may be in the Tools -section). Make sure Extensions is selected on the left. Do you see Enigmail? Make sure it's the latest version. If so, skip this step.

+section). Make sure Extensions is selected on the left. Do you see Enigmail? +Make sure it's the latest version. If so, skip this step.

If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.

@@ -244,7 +233,6 @@ or later versions.

Note: As of June 18, 2018, GnuPG 2.2.8 is unavailable for Debian stable and testing.

@@ -339,8 +327,8 @@ do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this -article by Micah Lee. +href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/"> +this article by Micah Lee.

If you'd like to pick a password manually, come up with something @@ -388,8 +376,8 @@ wasn't there.

More resources

If you're having trouble with our instructions or just want to learn more, check out Enigmail's -wiki instructions for key generation.

+href="https://enigmail.wiki/Key_Management#Generating_your_own_key_pair"> +Enigmail's wiki instructions for key generation.

Don't see a solution to your problem?

Please let us know on the

More documentation

If you're having trouble with our instructions or just want to learn more, check out Enigmail's -documentation.

+href="https://www.enigmail.net/documentation/quickstart-ch2.php#id2533620"> +Enigmail's documentation.

Don't see a solution to your problem?

Please let us know on the

More resources

If you're still having trouble with our instructions or just want to learn more, check out Enigmail's -wiki.

+href="https://enigmail.wiki/Signature_and_Encryption#Encrypting_a_message"> +Enigmail's wiki.

Don't see a solution to your problem?

Please let us know on the

- - + + - +--> + - diff --git a/en/infographic.html b/en/infographic.html index c287cd18..14876ba5 100644 --- a/en/infographic.html +++ b/en/infographic.html @@ -4,7 +4,8 @@ Email Self-Defense - a guide to fighting surveillance with GnuPG encryption - + @@ -15,6 +16,7 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" /> +

← Read the full guide

@@ -69,8 +71,8 @@ href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version), and the rest of it is under a Creative Commons Attribution-ShareAlike 4.0 license (or later version). Download the source -code of Edward reply bot by Andrew Engelbrecht +href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz"> +source code of Edward reply bot by Andrew Engelbrecht <sudoman@ninthfloor.org> and Josh Drake <zamnedix@gnu.org>, available under the GNU Affero General Public License. Why these @@ -102,12 +104,14 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" />

- - + + - +--> + - diff --git a/en/kitchen/assemble-all-pages b/en/kitchen/assemble-all-pages index 75e459c5..cddfdd56 100755 --- a/en/kitchen/assemble-all-pages +++ b/en/kitchen/assemble-all-pages @@ -47,8 +47,7 @@ set -e set -o pipefail function close_term () { - printf '\n%s' '*** Close the terminal window or press Return.'; read OK - test -z "$OK" && exit $1 + exit $1 } # Create temporary files. @@ -84,6 +83,7 @@ while read name; do echo "$include is missing." && close_term 1 fi sed -i "/^ - +--> diff --git a/en/kitchen/next_steps.t.html b/en/kitchen/next_steps.t.html index a2e606ca..c53e8c5f 100644 --- a/en/kitchen/next_steps.t.html +++ b/en/kitchen/next_steps.t.html @@ -63,7 +63,7 @@ we don't use Facebook.

- Translate!

Share -Teach your friends

+Share + - - - -

+ @@ -142,10 +134,10 @@ to teaching your friends.

This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This -makes it safer from surveillance than proprietary software (like Mac OS). To -defend your freedom as well as protect yourself from surveillance, we recommend -you switch to a free software operating system like GNU/Linux. Learn more -about free software at fsf.org.

+makes it safer from surveillance than proprietary software (like Windows or Mac +OS). To defend your freedom as well as protect yourself from surveillance, we +recommend you switch to a free software operating system like GNU/Linux. Learn +more about free software at fsf.org.

To get started, you'll need the IceDove desktop email program installed on your computer. For your system, IceDove may be known by the alternate name @@ -173,6 +165,15 @@ alt="Step 1.A: Install Wizard" />

Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account.

Look for the letters SSL, TLS, or STARTTLS to the right of the servers +when you're setting up your account. If you don't see them, you will still +be able to use encryption, but this means that the people running your email +system are running behind the industry standard in protecting your security +and privacy. We recommend that you send them a friendly email asking them +to enable SSL, TLS, or STARTTLS for your email server. They will know what +you're talking about, so it's worth making the request even if you aren't +an expert on these security systems.

@@ -181,7 +182,7 @@ that sets it up with your email account.

The wizard doesn't launch: You can launch the wizard yourself, but the menu option for doing so is -named differently in each email programs. The button to launch it will be in +named differently in each email program. The button to launch it will be in the program's main menu, under "New" or something similar, titled something like "Add account" or "New/Existing email account."; In many new email programs, the main menu is represented by an image of three stacked horizontal bars.
My email looks weird: Enigmail doesn't tend to play nice with HTML, which is used to format +emails, so it may disable your HTML formatting automatically. To send an +HTML-formatted email without encryption or a signature, hold down the Shift +key when you select compose. You can then write an email as if Enigmail +wasn't there.
Don't see a solution to your problem?: Please let us know on the feedback @@ -264,7 +269,7 @@ page.

@@ -333,8 +338,8 @@ do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this -article by Micah Lee. +href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/"> +this article by Micah Lee.

If you'd like to pick a password manually, come up with something @@ -367,6 +372,11 @@ email self-defense, as you'll learn more about in Section of three stacked horizontal bars. Enigmail may be inside a section called Tools. +

The wizard says that it cannot find GnuPG.

Open whatever program you usually use for installing software, and search +for GnuPG, then install it. Then restart the Enigmail setup wizard by going +to Enigmail → Setup Wizard.

My email looks weird

Enigmail doesn't tend to play nice with HTML, which is used to format emails, so it may disable your HTML formatting automatically. To send an @@ -377,8 +387,8 @@ wasn't there.

More resources

If you're having trouble with our instructions or just want to learn more, check out Enigmail's -wiki instructions for key generation.

+href="https://enigmail.wiki/Key_Management#Generating_your_own_key_pair"> +Enigmail's wiki instructions for key generation.

Don't see a solution to your problem?

Please let us know on the

More documentation

If you're having trouble with our instructions or just want to learn more, check out Enigmail's -documentation.

+href="https://www.enigmail.net/documentation/quickstart-ch2.php#id2533620"> +Enigmail's documentation.

Don't see a solution to your problem?

Please let us know on the

More resources

If you're still having trouble with our instructions or just want to learn more, check out Enigmail's -wiki.

+href="https://enigmail.wiki/Signature_and_Encryption#Encrypting_a_message"> +Enigmail's wiki.

Don't see a solution to your problem?

Please let us know on the -

From:From:

To:

@@ -1108,8 +1118,8 @@ href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version), and the rest of it is under a Creative Commons Attribution-ShareAlike 4.0 license (or later version). Download the source -code of Edward reply bot by Andrew Engelbrecht +href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz"> +source code of Edward reply bot by Andrew Engelbrecht <sudoman@ninthfloor.org> and Josh Drake <zamnedix@gnu.org>, available under the GNU Affero General Public License. Why these @@ -1141,12 +1151,14 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" />

- - + + - +--> + - diff --git a/en/next_steps.html b/en/next_steps.html index ae86c6df..00903b12 100644 --- a/en/next_steps.html +++ b/en/next_steps.html @@ -80,7 +80,7 @@ we don't use Facebook.

- the same way you installed Enigmail, by searching for it through Add-ons.

Before beginning to check your email over Tor, make sure you understand the -security tradeoffs involved. This +the security tradeoffs involved. This infographic from our friends at the Electronic Frontier Foundation demonstrates how Tor keeps you secure.

@@ -278,8 +278,8 @@ href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version), and the rest of it is under a Creative Commons Attribution-ShareAlike 4.0 license (or later version). Download the source -code of Edward reply bot by Andrew Engelbrecht +href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz"> +source code of Edward reply bot by Andrew Engelbrecht <sudoman@ninthfloor.org> and Josh Drake <zamnedix@gnu.org>, available under the GNU Affero General Public License. Why these @@ -311,12 +311,14 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" />

- - + + - +--> + - diff --git a/en/windows.html b/en/windows.html index aac8cf4c..165c12ad 100644 --- a/en/windows.html +++ b/en/windows.html @@ -51,26 +51,18 @@ style="color: #2F5FAA;">Translate!

Share -Teach your friends

+Share + - - - -

+ @@ -142,10 +134,10 @@ to teaching your friends.

This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This -makes it safer from surveillance than proprietary software (like Windows). To -defend your freedom as well as protect yourself from surveillance, we recommend -you switch to a free software operating system like GNU/Linux. Learn more -about free software at fsf.org.

Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account.

@@ -181,7 +182,7 @@ that sets it up with your email account.

The wizard doesn't launch: You can launch the wizard yourself, but the menu option for doing so is -named differently in each email programs. The button to launch it will be in +named differently in each email program. The button to launch it will be in the program's main menu, under "New" or something similar, titled something like "Add account" or "New/Existing email account."; In many new email programs, the main menu is represented by an image of three stacked horizontal bars.
My email looks weird: Enigmail doesn't tend to play nice with HTML, which is used to format +emails, so it may disable your HTML formatting automatically. To send an +HTML-formatted email without encryption or a signature, hold down the Shift +key when you select compose. You can then write an email as if Enigmail +wasn't there.
Don't see a solution to your problem?: Please let us know on the feedback @@ -264,7 +269,7 @@ page.

+ @@ -333,8 +338,8 @@ do it manually, or you can use the Diceware method. Doing it manually is faster but not as secure. Using Diceware takes longer and requires dice, but creates a password that is much harder for attackers figure out. To use it, read the section "Make a secure passphrase with Diceware" in this -article by Micah Lee. +href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/"> +this article by Micah Lee.

If you'd like to pick a password manually, come up with something @@ -367,11 +372,10 @@ email self-defense, as you'll learn more about in Section of three stacked horizontal bars. Enigmail may be inside a section called Tools.

More resources

If you're having trouble with our -instructions or just want to learn more, check out Enigmail's -wiki instructions for key generation.

The wizard says that it cannot find GnuPG.

Open whatever program you usually use for installing software, and search +for GnuPG, then install it. Then restart the Enigmail setup wizard by going +to Enigmail → Setup Wizard.

My email looks weird

Enigmail doesn't tend to play nice with HTML, which is used to format @@ -380,6 +384,12 @@ HTML-formatted email without encryption or a signature, hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.

More resources

If you're having trouble with our +instructions or just want to learn more, check out +Enigmail's wiki instructions for key generation.

Don't see a solution to your problem?

Please let us know on the feedback @@ -452,8 +462,8 @@ keyserver.

Identifying keys: Fingerprints and IDs

People's public keys are usually identified by their key fingerprint, which is a string of digits like F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 (for Edward's key). You can see the fingerprint for your public key, and @@ -1109,8 +1118,8 @@ href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version), and the rest of it is under a Creative Commons Attribution-ShareAlike 4.0 license (or later version). Download the source -code of Edward reply bot by Andrew Engelbrecht +href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz"> +source code of Edward reply bot by Andrew Engelbrecht <sudoman@ninthfloor.org> and Josh Drake <zamnedix@gnu.org>, available under the GNU Affero General Public License. Why these @@ -1142,12 +1151,14 @@ src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" />

- - + + - +--> + -

Step 1.b Install the Enigmail plugin for your email program

Step 1.c Install the Enigmail plugin for your email program

Step 1.c Install the Enigmail plugin for your email program

Identifying keys: Fingerprints and IDs