gnupg revision

2 files changed, 56 insertions, 58 deletions

diff --git a/tools/conf/etc/skel/.gnupg/gpg.conf b/tools/conf/etc/skel/.gnupg/gpg.conf
index 20eed65..48edc58 100644
--- a/tools/conf/etc/skel/.gnupg/gpg.conf
+++ b/tools/conf/etc/skel/.gnupg/gpg.conf
@@ -1,6 +1,3 @@
-# These first three lines are not copied to the gpg.conf file in
-# the users home directory.
-# $Id$
 # Options for GnuPG
 # Copyright 1998-2003, 2010 Free Software Foundation, Inc.
 # Copyright 1998-2003, 2010 Werner Koch
@@ -85,10 +82,8 @@
 # no-include-attributes = do not include attribute IDs (aka "photo IDs")
 #                         when sending keys to the keyserver.
 
-keyserver-options auto-key-retrieve
-#keyserver wwwkeys.pgp.net
-#keyserver search.keyserver.net
-keyserver pgp.mit.edu
+#keyserver-options auto-key-retrieve
+
 
 # Uncomment this line to display photo user IDs in key listings and
 # when a signature from a key with a photo is verified.
diff --git a/tools/gnupg.html b/tools/gnupg.html
index 61bfaba..f3feed1 100644
--- a/tools/gnupg.html
+++ b/tools/gnupg.html
@@ -10,6 +10,7 @@
 
         <h1>GnuPG</h1>
 
+        <h2 id="install">1. Install</h2>
         <p>Install gnupg;</p>
 
         <pre>
@@ -24,34 +25,7 @@
         $ sudo cp /usr/share/gnupg/gpg-conf.skel /etc/skel/.gnupg/gpg.conf
         </pre>
 
-        <p>Configure GnuPG to automatically fetch public keys,
-        uncomment following line to ~/.gnupg/gpg.conf;</p>
-
-        <pre>
-        keyserver-options auto-key-retrieve
-        </pre>
-
-        <p>And add a server, in this example wwwkeys.pgp.net;</p>
-
-        <pre>
-        # keyserver wwwkeys.pgp.net
-        # keyserver search.keyserver.net
-        keyserver pgp.mit.edu
-        </pre>
-
-        <p>Test your configuration as described by Justin R. Miller <a href="http://codesorcery.net/old/mutt/mutt-gnupg-howto">Mutt Gnupg Howto</a>;</p>
-
-        <pre>
-        $ gpg --recv-keys 0xC9C40C31
-        </pre>
-
-        <p>Confirm;</p>
-
-        <pre>
-        gpg --list-keys justin
-        </pre>
-
-        <h2 id="gpg-genkey">1. Generate keys</h2>
+        <h2 id="genkey">2. Generate keys</h2>
 
         <p>Options for creating a DSA and ElGamal key;</p>
         <dl>
@@ -83,26 +57,25 @@
            (4) RSA (sign only)
         Your selection? 2
         DSA keys may be between 1024 and 3072 bits long.
-        What keysize do you want? (2048) 2049
-        Requested keysize is 2049 bits
-        rounded up to 2112 bits
+        What keysize do you want? (2048) 2048
+        Requested keysize is 2048 bits
         Please specify how long the key should be valid.
                  0 = key does not expire
               &lt;n&gt;  = key expires in n days
               &lt;n&gt;w = key expires in n weeks
               &lt;n&gt;m = key expires in n months
               &lt;n&gt;y = key expires in n years
-        Key is valid for? (0) 1y
+        Key is valid for? (0) 6m
         Key expires at Tue May 30 20:29:36 2017 WEST
         Is this correct? (y/N) y
 
         GnuPG needs to construct a user ID to identify your key.
 
         Real name: User Name
-        Email address: user@external.org
+        Email address: user@core.privat-server.net
         Comment: user at external dot org
         You selected this USER-ID:
-            "User Name (user at external dot org) &lt;user@external.org&gt;"
+            "User Name (user at core) &lt;user@core.privat-server.net&gt;"
 
         Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? O
         </pre>
@@ -123,7 +96,7 @@
         /home/droid/.gnupg/pubring.kbx
         ------------------------------
         pub   dsa3072/EE29B7D3 2016-05-30 [SC] [expires: 2017-05-30]
-        uid         [ultimate] User Name (user at external dot org) &lt;user@external.org&gt;
+        uid         [ultimate] User Name (user at core ) &lt;user@core.privat-server.net&gt;
         sub   elg2112/9BC2DC12 2016-05-30 [E] [expires: 2017-05-30]
         </pre>
 
@@ -133,7 +106,7 @@
         export GPGKEY=0xEE29B7D3
         </pre>
 
-        <h2 id="management">2. Key Management</h2>
+        <h2 id="keys">3. Key Management</h2>
 
         <p>Key Management;</p>
 
@@ -146,7 +119,7 @@
         $ gpg --edit-key UID
         </pre>
 
-        <h3>2.1 Edit key</h3>
+        <h3>3.1 Edit key</h3>
 
         <pre>
         $ gpg --edit-key KEYID
@@ -162,9 +135,9 @@
         save
         </pre>
 
-        <h2 id="gpg-ei">3. Export and import keys</h2>
+        <h2 id="keyex">4. Export and import keys</h2>
 
-        <h3>3.1. Export Key</h3>
+        <h3>4.1. Export Key</h3>
 
         <p>Public keys can be exported in binary format
         or ASCII-armored format. To export binary format;</p>
@@ -185,14 +158,14 @@
 
         <h3>3.2. Export to keyserver</h3>
 
-        <p>The primary public key's ID is referenced in the pub 
+        <p>The primary public key's ID is referenced in the pub
         line after the key size, for example the key created above,
         the short key ID is EE29B7D3:
         <pre>
         gpg --keyserver search.keyserver.net --send-key EE29B7D3
         </pre>
 
-        <h3>3.3. Import Key</h3>
+        <h3>4.3. Import Key</h3>
 
         <p>Is very easy to import public keys;</p>
 
@@ -206,9 +179,39 @@
         $ gpg --list-keys
         </pre>
 
-        <h2 id="gpg-crypt">4. Encrypt, decrypt and signing</h2>
+        <h3>4.4. Key Servers</h3>
 
-        <h3>4.1. Encrypt file</h3>
+        <p>Configure GnuPG to automatically fetch public keys,
+        uncomment following line to ~/.gnupg/gpg.conf;</p>
+
+        <pre>
+        keyserver-options auto-key-retrieve
+        </pre>
+
+        <p>And add a server, in this example wwwkeys.pgp.net;</p>
+
+        <pre>
+        keyserver wwwkeys.pgp.net
+        keyserver search.keyserver.net
+        keyserver pgp.mit.edu
+        </pre>
+
+        <p>Test your configuration as described by Justin R. Miller <a href="http://codesorcery.net/old/mutt/mutt-gnupg-howto">Mutt Gnupg Howto</a>;</p>
+
+        <pre>
+        $ gpg --recv-keys 0xC9C40C31
+        </pre>
+
+        <p>Confirm;</p>
+
+        <pre>
+        gpg --list-keys justin
+        </pre>
+
+
+        <h2 id="cryptsign">5. Encrypt, decrypt and signing</h2>
+
+        <h3>5.1. Encrypt file</h3>
 
         <p>To be abble to decrypt the document we need to include
         public key in the recipient list;</p>
@@ -220,7 +223,7 @@
         index.html
         </pre>
 
-        <h3>4.2. Decrypt file</h3>
+        <h3>5.2. Decrypt file</h3>
 
         <p>To decrypt the file;</p>
 
@@ -228,7 +231,7 @@
         $ gpg --output index.html --decrypt index.html.gpg
         </pre>
 
-        <h3>4.3. Signing a File</h3>
+        <h3>5.3. Signing a File</h3>
 
         <p>A digital signature certifies and timestamps a document.
         If the document is subsequently modified in any way,
@@ -283,12 +286,12 @@
         $ gpg --verify index.html.sig
         </pre>
 
-        <a href="index.html">Systools Index</a>
-        <p>This is part of the SysDoc Manual.
-        Copyright (C) 2016
-        Silvino Silva.
-        See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
-        for copying conditions.</p>
+        <a href="index.html">Tools Index</a>
 
+        <p>
+        This is part of the c9-doc Manual.
+        Copyright (C) 2016
+        c9 team.
+        See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p>
     </body>
 </html>