From ecceeff615d04d03c595be3fe3301ddc23ccaffe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= Date: Thu, 21 Sep 2017 22:59:08 +0200 Subject: [PATCH] en/kitchen: update to v4 and reformat; new version of reformat-html. en/kitchen: new version of reformat-html --- en/kitchen/confirmation.t.html | 43 +- en/kitchen/footer.html | 60 +-- en/kitchen/head.html | 26 +- en/kitchen/index.t.html | 732 +++++++++++++++++++++++++++------ en/kitchen/infographic.t.html | 33 +- en/kitchen/javascript.html | 61 +-- en/kitchen/next_steps.t.html | 188 +++++---- en/kitchen/reformat-html | 147 ------- en/kitchen/reformat-html.1 | 139 +++++++ en/kitchen/translist.html | 32 +- 10 files changed, 982 insertions(+), 479 deletions(-) delete mode 100755 en/kitchen/reformat-html create mode 100755 en/kitchen/reformat-html.1 diff --git a/en/kitchen/confirmation.t.html b/en/kitchen/confirmation.t.html index 83da58f8..5691342e 100644 --- a/en/kitchen/confirmation.t.html +++ b/en/kitchen/confirmation.t.html @@ -2,36 +2,39 @@ diff --git a/en/kitchen/footer.html b/en/kitchen/footer.html index 0a973122..e3298d2f 100644 --- a/en/kitchen/footer.html +++ b/en/kitchen/footer.html @@ -3,42 +3,50 @@ -

Infographic and guide design by Journalism++ Infographic and guide design by Journalism++

- +alt="Journalism++" />

+ diff --git a/en/kitchen/head.html b/en/kitchen/head.html index 082cd412..b9bf4177 100644 --- a/en/kitchen/head.html +++ b/en/kitchen/head.html @@ -1,22 +1,18 @@ - + - - -Autodéfense courriel - un guide pour contrer la surveillance en -chiffrant avec GnuPG - - - - - - - - - + +Email Self-Defense - a guide to fighting surveillance with GnuPG +encryption + + - + diff --git a/en/kitchen/index.t.html b/en/kitchen/index.t.html index ac4578c8..ae00f2d1 100644 --- a/en/kitchen/index.t.html +++ b/en/kitchen/index.t.html @@ -12,16 +12,19 @@
  • GNU/Linux
  • Mac OS
  • Windows
  • +
  • Teach your friends
  • GNU/Linux
  • Mac OS
  • Windows
  • +
  • Teach your friends
  • GNU/Linux
  • Mac OS
  • Windows
  • +
  • Teach your friends
  • @@ -41,17 +44,22 @@ alt="[Hacker News]" />
  • Free Software Foundation

    +src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /> +
    -

    We fight for computer users' rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.

    +

    We fight for computer users' rights, and promote the development of free (as +in freedom) software. Resisting bulk surveillance is very important to us.

    -

    We want to translate this guide into more languages, and make a version for encryption on mobile devices. Please donate, and help people around the world take the first step towards protecting their privacy with free software.

    +

    Please donate to support Email Self-Defense. We need to keep +improving it, and making more materials, for the benefit of people around +the world taking the first step towards protecting their privacy.

    -

    Donate

    @@ -62,11 +70,29 @@ src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" />

    Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are coded to make sure a surveillance agent or thief intercepting your email can't read it. All you need is a computer with an Internet connection, an email account, and about half an hour.

    - -

    Even if you have nothing to hide, using encryption helps protect the privacy of people you communicate with, and makes life difficult for bulk surveillance systems. If you do have something important to hide, you're in good company; these are the same tools that Edward Snowden used to share his famous secrets about the NSA.

    - -

    In addition to using encryption, standing up to surveillance requires fighting politically for a reduction in the amount of data collected on us, but the essential first step is to protect yourself and make surveillance of your communication as difficult as possible. Let's get started!

    +alt="View & share our infographic →" /> +Bulk surveillance violates our fundamental rights and makes free speech +risky. This guide will teach you a basic surveillance self-defense skill: +email encryption. Once you've finished, you'll be able to send and receive +emails that are scrambled to make sure anyone, including a surveillance agent +or thief, intercepting your email can't read them. All you need is a computer +with an Internet connection, an email account, and about forty minutes.

    + +

    Even if you have nothing to hide, using encryption helps protect the privacy +of people you communicate with, and makes life difficult for bulk surveillance +systems. If you do have something important to hide, you're in good company; +these are the same tools that whistleblowers use to protect their identities +while shining light on human rights abuses, corruption and other crimes.

    + +

    In addition to using encryption, standing up +to surveillance requires fighting politically for a reduction +in the amount of data collected on us, but the essential first step is +to protect yourself and make surveillance of your communication as difficult +as possible. This guide helps you do that. It is designed for beginners, but +if you already know the basics of GnuPG or are an experienced free software +user, you'll enjoy the advanced tips and the guide +to teaching your friends.

    @@ -80,17 +106,38 @@ alt="View & share our infographic →" /> Bulk surveillance violates

    #1 Get the pieces

    -

    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). Learn more about free software at fsf.org.

    - -

    Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to download it. Before configuring GnuPG though, you'll need a desktop email program installed on your computer. Most GNU/Linux distributions have a free software version of the Thunderbird email program available to install. This guide will work with them, in addition to Thunderbird itself. Email programs are another way to access the same email accounts you can access in a browser (like Gmail), but provide extra features.

    +

    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). Learn more about free software at fsf.org.

    + +

    Most GNU/Linux operating systems come with GnuPG installed on them, +so you don't have to download it. Before configuring GnuPG though, you'll +need the IceDove desktop email program installed on your computer. Most +GNU/Linux distributions have IceDove installed already, though it may be +under the alternate name "Thunderbird." Email programs are another way to +access the same email accounts you can access in a browser (like Gmail), +but provide extra features.

    -

    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.

    - -

    To get started, you'll need a desktop email program installed on your computer. This guide works with free software versions of the Thunderbird email program, and with Thunderbird itself. Email programs are another way to access the same email accounts you can access in a browser (like Gmail), but provide extra features.

    +

    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 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 +"Thunderbird." Email programs are another way to access the same email accounts +you can access in a browser (like Gmail), but provide extra features.

    -

    If you already have an email program, you can skip to Step 1.b.

    +

    If you already have an email program, you can skip to Step 1.b.

    @@ -98,15 +145,26 @@ alt="View & share our infographic →" /> Bulk surveillance violates
    -

    Step 1.a Setup your email program with your email account

    +

    Step 1.a Set up your email program with your email account

    + +

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

    -

    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.

    @@ -115,16 +173,19 @@ alt="Step 1.A: Install Wizard" />

    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 the program's main menu, under "New" or something similar, titled something like "Add account" or "New/Existing email account."
    +
    You can launch the wizard yourself, but the menu option for doing so is +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."
    The wizard can't find my account or isn't downloading my mail
    - -
    Before searching the Web, we recommend you start by asking other people who use your email system, to figure out the correct settings.
    +
    Before searching the Web, we recommend you start by asking other people +who use your email system, to figure out the correct settings.
    - - +
    @@ -138,7 +199,10 @@ alt="Step 1.A: Install Wizard" />

    Step 1.b Get GnuPG by downloading GPGTools

    -

    GPGTools is a software package that includes GnuPG. Download and install it, choosing default options whenever asked. After it's installed, you can close any windows that it creates.

    +

    GPGTools is a software package that includes GnuPG. Download and install it, choosing +default options whenever asked. After it's installed, you can close any +windows that it creates.

    @@ -150,7 +214,10 @@ alt="Step 1.A: Install Wizard" />

    Step 1.b Get GnuPG by downloading GPG4Win

    -

    GPG4Win is a software package that includes GnuPG. Download and install it, choosing default options whenever asked. After it's installed, you can close any windows that it creates.

    +

    GPG4Win is a software package that includes GnuPG. Download and install it, choosing default +options whenever asked. After it's installed, you can close any windows that +it creates.

    @@ -193,9 +260,12 @@ alt="Step 1.C: Install Add-ons" />

    Step 1.c 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? If so, skip this step.

    +

    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? 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.

    +

    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.

    @@ -204,12 +274,20 @@ alt="Step 1.C: Install Add-ons" />
    I can't find the menu.
    +
    In many new email programs, the main menu is represented by an image of +three stacked horizontal bars.
    -
    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.
    - - +
    @@ -225,11 +303,26 @@ alt="Step 1.C: Install Add-ons" />

    #2 Make your keys

    -

    To use the GnuPG system, you'll need a public key and a private key (known together as a keypair). Each is a long string of randomly generated numbers and letters that are unique to you. Your public and private keys are linked together by a special mathematical function.

    +

    To use the GnuPG system, you'll need a public key and a private key (known +together as a keypair). Each is a long string of randomly generated numbers +and letters that are unique to you. Your public and private keys are linked +together by a special mathematical function.

    -

    Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as phonebook, where people who want to send you an encrypted email look up your public key.

    +

    Your public key isn't like a physical key, because it's stored in the open +in an online directory called a keyserver. People download it and use it, +along with GnuPG, to encrypt emails they send to you. You can think of the +keyserver as a phonebook; people who want to send you encrypted email can +look up your public key.

    -

    Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to decode encrypted emails other people send to you.

    +

    Your private key is more like a physical key, because you keep it to +yourself (on your computer). You use GnuPG and your private key together to +descramble encrypted emails other people send to you. You should never share you private key with anyone, under any +circumstances.

    + +

    In addition to encryption and decryption, you can also use these keys to +sign messages and check the authenticity of other people's signatures. We'll +discuss this more in the next section.

    @@ -237,7 +330,8 @@ alt="Step 1.C: Install Add-ons" />
    @@ -245,18 +339,50 @@ alt="Step 2.A: Make a Keypair" />

    Step 2.a Make a keypair

    -

    The Enigmail Setup wizard may start automatically. If it doesn't, select Enigmail → Setup Wizard from your email program's menu. You don't need to read the text in the window that pops up unless you'd like to, but it's good to read the text on the later screens of the wizard. Click Next with the default options selected, except in these instances:

    +

    The Enigmail Setup wizard may start automatically. If it doesn't, select +Enigmail → Setup Wizard from your email program's menu. You don't need +to read the text in the window that pops up unless you'd like to, but it's +good to read the text on the later screens of the wizard. Click Next with +the default options selected, except in these instances, which are listed +in the order they appear:

    -

    The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.

    - -

    When the "Key Generation Completed" screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there). You'll learn more about the revocation certificate in Section 5.

    +

    If you'd like to pick a password manually, come up with something +you can remember which is at least twelve characters long, and includes +at least one lower case and upper case letter and at least one number or +punctuation symbol. Never pick a password you've used elsewhere. Don't use +any recognizable patterns, such as birthdays, telephone numbers, pets' names, +song lyrics, quotes from books, and so on.

    + +

    The program will take a little while to finish the next +step, the "Key Creation" screen. While you wait, do something else with your +computer, like watching a movie or browsing the Web. The more you use the +computer at this point, the faster the key creation will go.

    + +

    When the "Key Generation Completed" screen +pops up, select Generate Certificate and choose to save it in a safe place on +your computer (we recommend making a folder called "Revocation Certificate" +in your home folder and keeping it there). This step is essential for your +email self-defense, as you'll learn more about in Section +5.

    @@ -265,18 +391,60 @@ alt="Step 2.A: Make a Keypair" />

    I can't find the Enigmail menu.
    +
    In many new email programs, the main menu is represented by an image +of three stacked horizontal bars. Enigmail may be inside a section called +Tools.
    -
    In many new email programs, the main menu is represented by an image 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 +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.
    -
    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.
    - - + +
    + +
    - + +
    + +

    Advanced

    + +
    +
    Command line key generation
    +
    If you prefer using the command line for a higher +degree of control, you can follow the documentation from The GNU Privacy +Handbook. Make sure you stick with "RSA and RSA" (the default), +because it's newer and more secure than the algorithms the documentation +recommends. Also make sure your key is at least 2048 bits, or 4096 if you +want to be extra secure.
    + +
    Advanced key pairs
    +
    When GnuPG creates a new keypair, it compartmentalizes +the encryption function from the signing function through subkeys. If you use +subkeys carefully, you can keep your GnuPG identity much more +secure and recover from a compromised key much more quickly. Alex Cabal +and the Debian wiki +provide good guides for setting up a secure subkey configuration.
    @@ -291,9 +459,14 @@ alt="Step 2.A: Make a Keypair" />

    In your email program's menu, select Enigmail → Key Management.

    -

    Right click on your key and select Upload Public Keys to Keyserver. Use the default keyserver in the popup.

    +

    Right click on your key and select Upload Public Keys to Keyserver. Use +the default keyserver in the popup.

    -

    Now someone who wants to send you an encrypted message can download your public key from the Internet. There are multiple keyservers that you can select from the menu when you upload, but they are all copies of each other, so it doesn't matter which one you use. However, it sometimes takes a few hours for them to match each other when a new key is uploaded.

    +

    Now someone who wants to send you an encrypted message can +download your public key from the Internet. There are multiple keyservers +that you can select from the menu when you upload, but they are all copies +of each other, so it doesn't matter which one you use. However, it sometimes +takes a few hours for them to match each other when a new key is uploaded.

    @@ -301,17 +474,41 @@ alt="Step 2.A: Make a Keypair" />

    Troubleshooting

    -
    The progress bar never finishes.
    - -
    Close the upload popup, make sure you are connected to the Internet, and try again. If that doesn't work, try again, selecting a different keyserver.
    - -
    My key doesnt appear in the list
    +
    The progress bar never finishes
    +
    Close the upload popup, make sure you are connected to the Internet, +and try again. If that doesn't work, try again, selecting a different +keyserver.
    +
    My key doesn't appear in the list
    Try checking "Display All Keys by Default."
    +
    More documentation
    +
    If you're having trouble with our +instructions or just want to learn more, check out +Enigmail's documentation.
    + + +
    + +
    - + +
    + +

    Advanced

    + +
    +
    Uploading a key from the command line
    +
    You can also upload your keys to a keyserver through the command line. The sks Web site +maintains a list of highly interconnected keyservers. You can also directly export +your key as a file on your computer.
    @@ -324,7 +521,11 @@ alt="Step 2.A: Make a Keypair" />

    GnuPG, OpenPGP, what?

    -

    In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the encryption standard, and GNU Privacy Guard (often shortened to GPG or GnuPG) is the program that implements the standard. Enigmail is a plug-in program for your email program that provides an interface for GnuPG.

    +

    In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP +are used interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the +encryption standard, and GNU Privacy Guard (often shortened to GPG or GnuPG) +is the program that implements the standard. Enigmail is a plug-in program +for your email program that provides an interface for GnuPG.

    @@ -338,15 +539,22 @@ alt="Step 2.A: Make a Keypair" />

    #3 Try it out!

    -

    Now you'll try a test correspondence with a computer program named Edward, which knows how to use encryption. Except where noted, these are the same steps you'd follow when corresponding with a real, live person.

    +

    Now you'll try a test correspondence with a computer program named Edward, +who knows how to use encryption. Except where noted, these are the same +steps you'd follow when corresponding with a real, live person.

    +
    @@ -354,15 +562,30 @@ alt="Try it out." />

    Step 3.a Send Edward your public key

    -

    This is a special step that you won't have to do when corresponding with real people. In your email program's menu, go to Enigmail → Key Management. You should see your key in the list that pops up. Right click on your key and select Send Public Keys by Email. This will create a new draft message, as if you had just hit the Write button.

    +

    This is a special step that you won't have to do when corresponding +with real people. In your email program's menu, go to Enigmail → Key +Management. You should see your key in the list that pops up. Right click +on your key and select Send Public Keys by Email. This will create a new +draft message, as if you had just hit the Write button.

    -

    Address the message to edward-en@fsf.org. Put at least one word (whatever you want) in the subject and body of the email. Then hit send.

    +

    Address the message to edward-en@fsf.org. Put at least one word +(whatever you want) in the subject and body of the email. Don't send yet.

    -

    There should be an icon of a yellow key in the bottom right of the composition window. This means that encryption is on, however, we want this first special message to Edward to be unencrypted. Click the key icon once to turn encryption off. The key should become grey, with a blue dot on it (to alert you that the setting has been changed from the default). Once encryption is off, hit Send.

    +

    The lock icon in the top left should be yellow, meaning encryption is +turned on. We want this first special message to be unencrypted, so +click the icon once to turn it off. The lock should become grey, with a +blue dot on it (to alert you that the setting has been changed from the +default). Once encryption is off, hit Send.

    -

    It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide. Once he's responded, head to the next step. From here on, you'll be doing just the same thing as when corresponding with a real person.

    +

    It may take two or three minutes for Edward to +respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide. Once he's responded, +head to the next step. From here on, you'll be doing just the same thing as +when corresponding with a real person.

    -

    When you open Edward's reply, Enigmail may prompt you for your password before using your private key to decrypt it.

    +

    When you open Edward's reply, GnuPG may prompt you for your password +before using your private key to decrypt it.

    @@ -373,19 +596,31 @@ alt="Try it out." />

    Step 3.b Send a test encrypted email

    -

    Write a new email in your email program, addressed to edward-en@fsf.org. Make the subject "Encryption test" or something similar and write something in the body.

    +

    Write a new email in your email program, addressed to edward-en@fsf.org. Make the subject +"Encryption test" or something similar and write something in the body.

    -

    They key in the bottom right of the window should be yellow, meaning encryption is on. This will be your default from now on.

    +

    The lock icon in the top left of the window should be yellow, meaning +encryption is on. This will be your default from now on.

    -

    Next to the key, you'll notice an icon of a pencil. Clicking this tells Enigmail to add a special, unique signature to your message, generated using your private key. This is a separate feature from encryption, and you don't have to use it for this guide.

    +

    Next to the lock, you'll notice an icon of a pencil. We'll +get to this in a moment.

    -

    Click Send. Enigmail will pop up a window that says "Recipients not valid, not trusted or not found."

    +

    Click Send. Enigmail will pop up a window that says "Recipients not valid, +not trusted or not found."

    -

    To encrypt an email to Edward, you need his public key, so now you'll have Enigmail download it from a keyserver. Click Download Missing Keys and use the default in the pop-up that asks you to choose a keyserver. Once it finds keys, check the first one (Key ID starting with C), then select ok. Select ok in the next pop-up.

    +

    To encrypt an email to Edward, you need his public key, so now you'll have +Enigmail download it from a keyserver. Click Download Missing Keys and use +the default in the pop-up that asks you to choose a keyserver. Once it finds +keys, check the first one (Key ID starting with C), then select ok. Select +ok in the next pop-up.

    -

    Now you are back at the "Recipients not valid, not trusted or not found" screen. Check the box in front of Edward's key and click Send.

    +

    Now you are back at the "Recipients not valid, not trusted or not found" +screen. Check the box in front of Edward's key and click Send.

    -

    Since you encrypted this email with Edward's public key, Edward's private key is required to decrypt it. Edward is the only one with his private key, so no one except him — not even you — can decrypt it.

    +

    Since you encrypted this email with Edward's public key, +Edward's private key is required to decrypt it. Edward is the only one with +his private key, so no one except him can decrypt it.

    @@ -394,12 +629,41 @@ alt="Try it out." />

    Enigmail can't find Edward's key
    - -
    Close the pop-ups that have appeared since you clicked Send. Make sure you are connected to the Internet and try again. If that doesn't work, repeat the process, choosing a different keyserver when it asks you to pick one.
    +
    Close the pop-ups that have appeared since you clicked Send. Make sure +you are connected to the Internet and try again. If that doesn't work, repeat +the process, choosing a different keyserver when it asks you to pick one.
    + +
    Unscrambled messages in the Sent folder
    +
    Even though you can't decrypt messages encrypted to someone else's key, +your email program will automatically save a copy encrypted to your public key, +which you'll be able to view from the Sent folder like a normal email. This +is normal, and it doesn't mean that your email was not sent encrypted.
    + +
    More resources
    +
    If you're still having trouble with our +instructions or just want to learn more, check out +Enigmail's wiki.
    + +
    + +
    + + +
    + +

    Advanced

    - +
    +
    Encrypt messages from the command line
    +
    You can also encrypt and decrypt messages and files from the command line, +if that's your preference. The option --armor makes the encrypted output +appear in the regular character set.
    @@ -412,7 +676,13 @@ alt="Try it out." />

    Important: Security tips

    -

    Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.

    +

    Even if you encrypt your email, the subject line is not encrypted, so +don't put private information there. The sending and receiving addresses +aren't encrypted either, so a surveillance system can still figure out who +you're communicating with. Also, surveillance agents will know that you're +using GnuPG, even if they can't figure out what you're saying. When you +send attachments, Enigmail will give you the choice to encrypt them or not, +independent of the actual email.

    @@ -423,31 +693,75 @@ alt="Try it out." />

    Step 3.c Receive a response

    -

    When Edward receives your email, he will use his private key to decrypt it, then use your public key (which you sent him in Step 3.A) to encrypt his reply to you.

    +

    When Edward receives your email, he will use his private key to decrypt +it, then use your public key (which you sent him in Step +3.A) to encrypt his reply to you.

    -

    It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide.

    +

    It may take two or three minutes for Edward to +respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide.

    -

    When you receive Edward's email and open it, Enigmail will automatically detect that it is encrypted with your public key, and then it will use your private key to decrypt it.

    +

    When you receive Edward's email and open it, Enigmail will automatically +detect that it is encrypted with your public key, and then it will use your +private key to decrypt it.

    -

    Notice the bar that Enigmail shows you above the message, with information about the status of Edward's key.

    +

    Notice the bar that Enigmail shows you above the message, with information +about the status of Edward's key.

    - +
    -

    Step 3.d Send a test signed email to a friend

    +

    Step 3.d Send a test signed email

    -

    Write a new email in your email program, addressed to a friend. If you want, tell them about this guide!

    +

    GnuPG includes a way for you to sign messages and files, verifying that +they came from you and that they weren't tampered with along the way. These +signatures are stronger than their pen-and-paper cousins -- they're impossible +to forge, because they're impossible to create without your private key +(another reason to keep your private key safe).

    -

    Before sending the email, click the icon of the pencil in the bottom right of the composition window (it should turn yellow). This tells Enigmail to sign the email with you private key.

    +

    You can sign messages to anyone, so it's a great way to make people +aware that you use GnuPG and that they can communicate with you securely. If +they don't have GnuPG, they will be able to read your message and see your +signature. If they do have GnuPG, they'll also be able to verify that your +signature is authentic.

    -

    After you click send, Enigmail will ask you for your password. It will do this any time it needs to use your public key.

    +

    To sign an email to Edward, compose any message to him and click the +pencil icon next to the lock icon so that it turns gold. If you sign a +message, GnuPG may ask you for your password before it sends the message, +because it needs to unlock your private key for signing.

    +

    With the lock and pencil icons, you can choose whether each message will +be encrypted, signed, both, or neither.

    + +
    ---> - + + +
    +
    + +

    Step 3.e Receive a response

    + +

    When Edward receives your email, he will use your public key (which you +sent him in Step 3.A) to verify that your signature +is authentic and the message you sent has not been tampered with.

    + +

    It may take two or three minutes for Edward to +respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide.

    + +

    Edward's reply will arrive encrypted, because he prefers to use encryption +whenever possible. If everything goes according to plan, it should say +"Your signature was verified." If your test signed email was also encrypted, +he will mention that first.

    + +
    +
    +
    @@ -457,13 +771,26 @@ alt="Try it out." />

    #4 Learn the Web of Trust

    -

    Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.

    +

    Email encryption is a powerful technology, but it has a weakness; +it requires a way to verify that a person's public key is actually +theirs. Otherwise, there would be no way to stop an attacker from making +an email address with your friend's name, creating keys to go with it and +impersonating your friend. That's why the free software programmers that +developed email encryption created keysigning and the Web of Trust.

    -

    When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, forming a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

    +

    When you sign someone's key, you are publicly saying that you've verified +that it belongs to them and not someone else.

    -

    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 other public keys saved on your computer, by going to Enigmail → Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that people can double-check that they have the correct public key when they download yours from a keyserver.

    +

    Signing keys and signing messages use the same type of mathematical +operation, but they carry very different implications. It's a good practice +to generally sign your email, but if you casually sign people's keys, you +may accidently end up vouching for the identity of an imposter.

    -

    You may also see public keys referred to by their key ID, which is simply the last 8 digits of the fingerprint, like C09A61E8 for Edward. The key ID is visible directly from the Key Management window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to whom are trying to communicate to verify which one to use.

    +

    People who use your public key can see who has signed it. Once you've +used GnuPG for a long time, your key may have hundreds of signatures. You +can consider a key to be more trustworthy if it has many signatures from +people that you trust. The Web of Trust is a constellation of GnuPG users, +connected to each other by chains of trust expressed through signatures.

    @@ -471,7 +798,8 @@ alt="Try it out." />

    @@ -481,43 +809,107 @@ alt="Section 4: Web of Trust" />

    In your email program's menu, go to Enigmail → Key Management.

    -

    Right click on Edward's public key and select Sign Key from the context menu.

    +

    Right click on Edward's public key and select Sign Key from the context +menu.

    In the window that pops up, select "I will not answer" and click ok.

    -

    Now you should be back at the Key Management menu. Select Keyserver → Upload Public Keys and hit ok.

    +

    Now you should be back at the Key Management menu. Select Keyserver → +Upload Public Keys and hit ok.

    -

    You've just effectively said "I trust that Edward's public key actually belongs to Edward." This doesn't mean much because Edward isn't a real person, but it's good practice.

    +

    You've just effectively said "I trust that Edward's public +key actually belongs to Edward." This doesn't mean much because Edward isn't +a real person, but it's good practice.

    +
    End #pgp-pathfinder --> -
    +
    -

    Important: check people's identification before signing their keys

    +

    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 +other public keys saved on your computer, by going to Enigmail → Key +Management in your email program's menu, then right clicking on the key +and choosing Key Properties. It's good practice to share your fingerprint +wherever you share your email address, so that people can double-check that +they have the correct public key when they download yours from a keyserver.

    + +

    You may also see public keys referred to by their key ID, +which is simply the last eight digits of the fingerprint, like C09A61E8 for +Edward. The key ID is visible directly from the Key Management window. This +key ID is like a person's first name (it is a useful shorthand but may not be +unique to a given key), whereas the fingerprint actually identifies the key +uniquely without the possibility of confusion. If you only have the key ID, +you can still look up the key (as well as its fingerprint), like you did in +Step 3, but if multiple options appear, you'll need the fingerprint of the +person to whom you are trying to communicate to verify which one to use.

    + +
    +
    + + +
    +
    + +

    Important: What to consider when signing keys

    + +

    Before signing a person's key, you need to be confident that it actually +belongs to them, and that they are who they say they are. Ideally, this +confidence comes from having interactions and conversations with them over +time, and witnessing interactions between them and others. Whenever signing +a key, ask to see the full public key fingerprint, and not just the shorter +key ID. If you feel it's important to sign the key of someone you've just +met, also ask them to show you their government identification, and make +sure the name on the ID matches the name on the public key. In Enigmail, +answer honestly in the window that pops up and asks "How carefully have you +verified that the key you are about to sign actually belongs to the person(s) +named above?"

    + + +
    -

    Before signing a real person's key, always make sure it actually belongs to them, and that they are who they say they are. Ask them to show you their ID (unless you trust them very highly) and their public key fingerprint -- not just the shorter public key ID, which could refer to another key as well. In Enigmail, answer honestly in the window that pops up and asks "How carefully have you verified that the key you are about to sign actually belongs to the person(s) named above?".

    +

    Advanced

    +
    +
    Master the Web of Trust
    +
    Unfortunately, trust does not spread between users the way many people +think. One of best ways to strengthen the GnuPG community is to deeply understand the Web of +Trust and to carefully sign as many people's keys as circumstances permit.
    + +
    Set ownertrust
    +
    If you trust someone enough to validate other people's keys, you can assign +them an ownertrust level through Enigmails's key management window. Right +click on the other person's key, go to the "Select Owner Trust" menu option, +select the trustlevel and click OK. Only do this once you feel you have a +deep understanding of the Web of Trust.
    +
    + +
    -
    +
    @@ -528,7 +920,10 @@ alt="Section 4: Web of Trust" />

    #5 Use it well

    -

    Everyone uses GnuPG a little differently, but it's important to follow some basic practices to keep your email secure. Not following them, you risk the privacy of the people you communicate with, as well as your own, and damage the Web of Trust.

    +

    Everyone uses GnuPG a little differently, but it's important to follow +some basic practices to keep your email secure. Not following them, you +risk the privacy of the people you communicate with, as well as your own, +and damage the Web of Trust.

    @@ -536,17 +931,30 @@ alt="Section 4: Web of Trust" />

    -

    When should I encrypt?

    +

    When should I encrypt? When should I sign?

    -

    The more you can encrypt your messages, the better. If you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

    +

    The more you can encrypt your messages, the better. If you only encrypt +emails occasionally, each encrypted message could raise a red flag for +surveillance systems. If all or most of your email is encrypted, people +doing surveillance won't know where to start. That's not to say that only +encrypting some of your email isn't helpful -- it's a great start and it +makes bulk surveillance more difficult.

    -

    That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.

    +

    Unless you don't want to reveal your own identity (which requires other +protective measures), there's no reason not to sign every message, whether or +not you are encrypting. In addition to allowing those with GnuPG to verify +that the message came from you, signing is a non-intrusive way to remind +everyone that you use GnuPG and show support for secure communication. If you +often send signed messages to people that aren't familiar with GnuPG, it's +nice to also include a link to this guide in your standard email signature +(the text kind, not the cryptographic kind).

    @@ -555,19 +963,27 @@ alt="Section 5: Use it Well (1)" />

    -

    Important: Be wary of invalid keys

    +

    Be wary of invalid keys

    -

    GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.

    +

    GnuPG makes email safer, but it's still important to watch out for invalid +keys, which might have fallen into the wrong hands. Email encrypted with +invalid keys might be readable by surveillance programs.

    -

    In your email program, go back to the second email that Edward sent you. Because Edward encrypted it with your public key, it will have a message from Enigmail at the top, which most likely says "Enigmail: Part of this message encrypted."

    +

    In your email program, go back to the first encrypted email that Edward +sent you. Because Edward encrypted it with your public key, it will have a +message from Enigmail at the top, which most likely says "Enigmail: Part of +this message encrypted."

    -

    When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.

    +

    When using GnuPG, make a habit of glancing at that bar. The program +will warn you there if you get an email encrypted with a key that can't +be trusted.

    @@ -578,9 +994,14 @@ alt="Section 5: Use it Well (2)" />

    Copy your revocation certificate to somewhere safe

    -

    Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.

    +

    Remember when you created your keys and saved the revocation certificate +that GnuPG made? It's time to copy that certificate onto the safest digital +storage that you have -- the ideal thing is a flash drive, disk, or hard +drive stored in a safe place in your home, not on a device you carry with +you regularly.

    -

    If your private key ever gets lost or stolen, you'll need this certificate file to let people know that you are no longer using that keypair.

    +

    If your private key ever gets lost or stolen, you'll need this certificate +file to let people know that you are no longer using that keypair.

    @@ -591,22 +1012,72 @@ alt="Section 5: Use it Well (2)" />

    Important: act swiftly if someone gets your private key

    -

    If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the instructions on the GnuPG site. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.

    +

    If you lose your private key or someone else gets ahold +of it (say, by stealing or cracking your computer), it's +important to revoke it immediately before someone else uses +it to read your encrypted email or forge your signature. This +guide doesn't cover how to revoke a key, but you can follow these instructions. +After you're done revoking, make a new key and send an email to everyone +with whom you usually use your key to make sure they know, including a copy +of your new key.

    + + + + +
    +
    + +

    Webmail and GnuPG

    + +

    When you use a web browser to access your email, you're using webmail, +an email program stored on a distant website. Unlike webmail, your desktop +email program runs on your own computer. Although webmail can't decrypt +encrypted email, it will still display it in its encrypted form. If you +primarily use webmail, you'll know to open your email client when you receive +a scrambled email.

    + +
    +
    + @@ -622,8 +1093,9 @@ alt="Section 5: Use it Well (2)" />

    - - - + + + - diff --git a/en/kitchen/next_steps.t.html b/en/kitchen/next_steps.t.html index 7abab66f..a2e606ca 100644 --- a/en/kitchen/next_steps.t.html +++ b/en/kitchen/next_steps.t.html @@ -15,9 +15,9 @@

    #6 Next steps

    -

    You've now completed the basics of email encryption with GnuPG, taking action against -bulk surveillance. A pat on the back to you! These next steps will help make the most of -the work you did today.

    +

    You've now completed the basics of email encryption with GnuPG, taking +action against bulk surveillance. These next steps will help make the most +of the work you've done.

    @@ -34,39 +34,49 @@ alt="View & share our infographic →" />

    Join the movement

    -

    You've just taken a huge step towards protecting your privacy online. But each of us -acting alone isn't enough. To topple bulk surveillance, we need to build a movement for the -autonomy and freedom of all computer users. Join the Free Software Foundation's community -to meet like-minded people and work together for change.

    +

    You've just taken a huge step towards protecting your privacy online. But +each of us acting alone isn't enough. To topple bulk surveillance, we need +to build a movement for the autonomy and freedom of all computer users. Join +the Free Software Foundation's community to meet like-minded people and work +together for change.

    + +

    + GNU Social  |  + + Pump.io  |  +Twitter

    + +

    Read why GNU Social and Pump.io +are better than Twitter, and why +we don't use Facebook.

    -

    - GNU Social - Pump.io Twitter

    - -

    Read why GNU Social and Pump.io are better -than Twitter.

    - -
    +
    + @@ -74,31 +84,34 @@ policy.

    -
    +
    -

    Get your friends involved

    +

    Bring Email Self-Defense to new people

    -

    This is the single biggest thing you can do to promote email -encryption.

    +

    Understanding and setting up email encryption is a daunting task for +many. To welcome them, make it easy to find your public key and offer to +help with encryption. Here are some suggestions:

    -

    Before you close this guide, use our sharing page to compose a message to a few friends -and ask them to join you in using encrypted email. Remember to include your GnuPG public key ID so they can easily download your key.

    +
      +
    • Lead an Email Self-Defense workshop for your friends and community, +using our teaching guide.
    • -

      It's also great to add your public key fingerprint to your email signature so that -people you are corresponding with know you accept encrypted email.

      +
    • Use our sharing page to compose +a message to a few friends and ask them to join you in using encrypted +email. Remember to include your GnuPG public key fingerprint so they can +easily download your key.
    • -

      We recommend you even go a step further and add it to your social media -profiles, blog, Website, or business card. (At the Free Software Foundation, we put ours -on our staff page.) We need to get our culture -to the point that we feel like something is missing when we see an email address without -a public key fingerprint.

      +
    • Add your public key fingerprint anywhere that you normally display +your email address. Some good places are: your email signature (the text +kind, not the cryptographic kind), social media profiles, blogs, Websites, +or business cards. At the Free Software Foundation, we put ours on our staff page.
    • +
    -
    +
    @@ -106,54 +119,82 @@ a public key fingerprint.

    Protect more of your digital life

    -

    Learn surveillance-resistant technologies for instant messages, hard drive storage, online -sharing, and more at +

    Learn surveillance-resistant technologies for instant +messages, hard drive storage, online sharing, and more at the Free Software Directory's Privacy Pack and prism-break.org.

    +

    If you are using Windows, Mac OS or any other proprietary operating +system, we recommend you switch to a free software operating system like +GNU/Linux. This will make it much harder for attackers to enter your computer +through hidden back doors. Check out the Free Software Foundation's endorsed versions of +GNU/Linux.

    + +
    + + + +
    +
    + +

    Optional: Add more email protection with Tor

    +

    The Onion Router +(Tor) network wraps Internet communication in multiple layers of encryption +and bounces it around the world several times. When used properly, Tor confuses +surveillance field agents and the global surveillance apparatus alike. Using +it simultaneously with GnuPG's encryption will give you the best results.

    -

    If you are using Windows, Mac OS or any other proprietary operating system, we recommend -you switch to a free software operating system like GNU/Linux. This will make it much -harder for attackers to enter your computer through hidden back doors. Check out the Free -Software Foundation's endorsed -versions of GNU/Linux.

    +

    To have your email program send and receive email over Tor, install the Torbirdy +plugin 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 infographic from our +friends at the Electronic Frontier Foundation demonstrates how Tor keeps +you secure.

    -
    +

    Make Email Self-Defense tools even better

    -

    Leave feedback and -suggest improvements to this guide. We welcome translations, but we ask that you -contact us at campaigns@fsf.org before you start, +

    Leave +feedback and suggest improvements to this guide. We +welcome translations, but we ask that you contact us at campaigns@fsf.org before you start, so that we can connect you with other translators working in your language.

    If you like programming, you can contribute code to GnuPG or Enigmail.

    -

    To go the extra mile, support the Free Software Foundation so we can keep improving -Email Self-Defense, and make more tools like it.

    +

    To go the extra mile, support the Free Software Foundation so we can keep +improving Email Self-Defense, and make more tools like it.

    +alt="Donate" +src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" />


    @@ -165,16 +206,18 @@ alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" />

    Learn more about GnuPG

    -

    There are a lot more features of GnuPG to discover, including encrypting files on your -computer. There are a variety of resources accessible via Google, but we recommend starting -with the links on the GnuPG Web site.

    +

    There are a lot more features of GnuPG to discover, including +encrypting files on your computer. There are a variety of resources +accessible via Google, but we recommend starting with the links on the GnuPG Web site.

    -
    +--> + -,&\n,' $tmp + +# Fuse header, section and footer with the corresponding div. +for tag in header section footer; do + sed -i "/^<$tag/ {N; s,\\(<$tag[^>]*>\\)\\n
    ,\\1
    ,}" $tmp + sed -i "/^<\\/div>$/ {N; s,<\\/div>\\n\\(<\\/$tag>\\),
    \\1,}" $tmp +done + +# Make the text more readable. +sed -i 's,\(]*>\)<,\1\n<,' $tmp +sed -i 's,\(]*>\)<,\1\n<,' $tmp + +for tag in p dd li h1 h2 h3 form; do + sed -i "/<\\/$tag>$/s,$,\\n," $tmp +done +for tag in p dl ul h1 h2 h3 h4 form body; do + sed -i "/^<$tag/s,^,\\n," $tmp +done +sed -i '/^$/ {N; s,^\n,\n,}' $tmp +sed -i '/^$/ {N; s,^\n,\n,}' $tmp + +# Remove blank lines in menus and image blocks. +sed -i '/^$/ {N; s,^\n
  • ]*>/ {N;N; s,\n\n,\n,}' $tmp + +# Unwrap the last item of the language list for easier +# replacement. +sed -i '/
  • $tmp2 + +# Suppress repeated empty lines. +cat -s $tmp2 $tmp1 > $output + +sleep_or_exit 0 diff --git a/en/kitchen/translist.html b/en/kitchen/translist.html index 2f27f6cf..27865605 100644 --- a/en/kitchen/translist.html +++ b/en/kitchen/translist.html @@ -1,17 +1,21 @@ -- 2.25.1