[git] GnuPG - branch, master, updated. gnupg-2.1.2-15-ga9acf10

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  a9acf10a1522332bbcd427ac52914ce3c9ce85a1 (commit)
      from  2fc27c8696f5cf2ddf3212397ea49bff115d617b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a9acf10a1522332bbcd427ac52914ce3c9ce85a1
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Feb 26 11:57:06 2015 +0100

    doc: Update the description of the S2K extension.
    
    --

diff --git a/doc/DETAILS b/doc/DETAILS
index 59ccaec..4286f45 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -1125,12 +1125,26 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 
 * GNU extensions to the S2K algorithm
 
-  S2K mode 101 is used to identify these extensions.
-  After the hash algorithm the 3 bytes "GNU" are used to make
-  clear that these are extensions for GNU, the next bytes gives the
-  GNU protection mode - 1000.  Defined modes are:
-  - 1001 :: Do not store the secret part at all.
-  - 1002 :: A stub to access smartcards (not used in 1.2.x)
+  1 octet  - S2K Usage: either 254 or 255.
+  1 octet  - S2K Cipher Algo: 0
+  1 octet  - S2K Specifier: 101
+  3 octets - "GNU"
+  1 octet  - GNU S2K Extension Number.
+
+  If such a GNU extension is used neither an IV nor any kind of
+  checksum is used.  The defined GNU S2K Extension Numbers are:
+
+  - 1 :: Do not store the secret part at all.  No specific data
+         follows.
+
+  - 2 :: A stub to access smartcards.  This data follows:
+         - One octet with the length of the following serial number.
+         - The serial number. Regardless of what the length octet
+           indicates no more than 16 octets are stored.
+
+  Note that gpg stores the GNU S2K Extension Number internally as an
+  S2K Specifier with an offset of 1000.
+
 
 * Keyserver helper message format
 

-----------------------------------------------------------------------

Summary of changes:
 doc/DETAILS | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org