[git] gnupg-doc - branch, master, updated. a4133d9e238e266a28a1fd158884f69408f9a69e

[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 GnuPG website and other docs".

The branch, master has been updated
       via  a4133d9e238e266a28a1fd158884f69408f9a69e (commit)
      from  acb4c49a5e5865670f31831782ae88731a9f4d0f (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 a4133d9e238e266a28a1fd158884f69408f9a69e
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 28 14:37:34 2015 +0200

    rfc4880bis: Merge with RFC-5581 (Camellia).

diff --git a/misc/id/common/reference.RFC.3713.xml b/misc/id/common/reference.RFC.3713.xml
new file mode 100644
index 0000000..bffa7fb
--- /dev/null
+++ b/misc/id/common/reference.RFC.3713.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<reference anchor='RFC3713'>
+
+<front>
+<title>A Description of the Camellia Encryption Algorithm</title>
+<author initials='M.' surname='Matsui' fullname='M. Matsui'>
+<organization /></author>
+<author initials='J.' surname='Nakajima' fullname='J. Nakajima'>
+<organization /></author>
+<author initials='S.' surname='Moriai' fullname='S. Moriai'>
+<organization /></author>
+<date year='2004' month='April' />
+<abstract>
+<t>This document describes the Camellia encryption algorithm.  Camellia is a block cipher with 128-bit block size and 128-, 192-, and 256-bit keys.  The algorithm description is presented together with key scheduling part and data randomizing part.  This memo provides information for the Internet community.</t></abstract></front>
+
+<seriesInfo name='RFC' value='3713' />
+<format type='TXT' octets='25031' target='http://www.rfc-editor.org/rfc/rfc3713.txt' />
+</reference>
diff --git a/misc/id/rfc4880bis/back.mkd b/misc/id/rfc4880bis/back.mkd
index c06a404..12cbd83 100644
--- a/misc/id/rfc4880bis/back.mkd
+++ b/misc/id/rfc4880bis/back.mkd
@@ -1,6 +1,7 @@
-# Changes since -00
+# Changes since RFC 4880
 
-  - xxxx
+  - Applied errata 2270, 2271, 2242, 3298.
+  - Added Camellia cipher from RFC 5581.
 
 
   <!-- To avoid warnings from pandoc2rfc we add some references -->
diff --git a/misc/id/rfc4880bis/middle.mkd b/misc/id/rfc4880bis/middle.mkd
index d3278d6..f5da03c 100644
--- a/misc/id/rfc4880bis/middle.mkd
+++ b/misc/id/rfc4880bis/middle.mkd
@@ -10,6 +10,9 @@ and key management functions.  It is a revision of RFC 2440, "OpenPGP
 Message Format", which itself replaces RFC 1991, "PGP Message Exchange
 Formats" [](#RFC1991) [](#RFC2440).
 
+This document obsoletes: RFC 5581 (Camellia cipher).
+
+
 ## {1.1} Terms
 
      * OpenPGP - This is a term for security software that uses PGP 5.x
@@ -2702,6 +2705,9 @@ algorithm.
           8  AES with 192-bit key
           9  AES with 256-bit key
          10  Twofish with 256-bit key [](#TWOFISH)
+         11  Camellia with 128-bit key [](#RFC3713)
+         12  Camellia with 192-bit key
+         13  Camellia with 256-bit key
  100 to 110  Private/Experimental algorithm
 
 Implementations MUST implement TripleDES.  Implementations SHOULD
diff --git a/misc/id/rfc4880bis/template.xml b/misc/id/rfc4880bis/template.xml
index 6c93688..b3dca2f 100644
--- a/misc/id/rfc4880bis/template.xml
+++ b/misc/id/rfc4880bis/template.xml
@@ -16,6 +16,7 @@
   <!ENTITY rfc.3156       PUBLIC '' '../common/reference.RFC.3156.xml'>
   <!ENTITY rfc.3447       PUBLIC '' '../common/reference.RFC.3447.xml'>
   <!ENTITY rfc.3629       PUBLIC '' '../common/reference.RFC.3629.xml'>
+  <!ENTITY rfc.3713       PUBLIC '' '../common/reference.RFC.3713.xml'>
   <!ENTITY rfc.4086       PUBLIC '' '../common/reference.RFC.4086.xml'>
   <!ENTITY iso.10646      PUBLIC '' '../common/reference.ISO.10646-1.1993.xml'>
 ]>
@@ -201,6 +202,7 @@
       &rfc.3156;
       &rfc.3447;
       &rfc.3629;
+      &rfc.3713;
       &rfc.4086;
     </references>
     <references title="Informative References">

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

Summary of changes:
 misc/id/common/reference.RFC.3713.xml | 19 +++++++++++++++++++
 misc/id/rfc4880bis/back.mkd           |  5 +++--
 misc/id/rfc4880bis/middle.mkd         |  6 ++++++
 misc/id/rfc4880bis/template.xml       |  2 ++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 misc/id/common/reference.RFC.3713.xml


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org