[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-160-g9d32896

[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 crypto library".

The branch, master has been updated
       via  9d328962660da72f094dc5424d5ef67abbaffdf6 (commit)
      from  4f7dcdc25af269b12275126edeef30b262fb891d (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 9d328962660da72f094dc5424d5ef67abbaffdf6
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 8 09:07:09 2015 +0100

    cipher: Prepare for OCB mode.
    
    * src/gcrypt.h.in (GCRY_CIPHER_MODE_OCB): New.
    --
    
    This is merely a claim that I am working on OCB mode.

diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index 30acd2f..7337db9 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -1647,6 +1647,11 @@ Associated Data (AEAD) block cipher mode, which is specified in
 Poly1305 is an Authenticated Encryption with Associated Data (AEAD)
 mode, which can be used with ChaCha20 and Salsa20 stream ciphers.
 
+ at item  GCRY_CIPHER_MODE_OCB
+ at cindex OCB, OCB3
+OCB is an Authenticated Encryption with Associated Data (AEAD) block
+cipher mode, which is specified in RFC-7253.
+
 @end table
 
 @node Working with cipher handles
@@ -1675,12 +1680,14 @@ and the according constants.  Note that some modes are incompatible
 with some algorithms - in particular, stream mode
 (@code{GCRY_CIPHER_MODE_STREAM}) only works with stream ciphers.
 Poly1305 AEAD mode (@code{GCRY_CIPHER_MODE_POLY1305}) only works with
-ChaCha and Salsa stream ciphers. The block cipher modes (@code{GCRY_CIPHER_MODE_ECB},
- at code{GCRY_CIPHER_MODE_CBC}, @code{GCRY_CIPHER_MODE_CFB},
- at code{GCRY_CIPHER_MODE_OFB} and @code{GCRY_CIPHER_MODE_CTR}) will work
-with any block cipher algorithm. GCM mode (@code{GCRY_CIPHER_MODE_CCM}) and
-CCM mode (@code{GCRY_CIPHER_MODE_GCM}) will only work with block cipher algorithms
-which have the block size of 16 bytes.
+ChaCha and Salsa stream ciphers. The block cipher modes
+(@code{GCRY_CIPHER_MODE_ECB}, @code{GCRY_CIPHER_MODE_CBC},
+ at code{GCRY_CIPHER_MODE_CFB}, @code{GCRY_CIPHER_MODE_OFB} and
+ at code{GCRY_CIPHER_MODE_CTR}) will work with any block cipher
+algorithm.  GCM mode (@code{GCRY_CIPHER_MODE_CCM}), CCM mode
+(@code{GCRY_CIPHER_MODE_GCM}), and OCB mode
+(@code{GCRY_CIPHER_MODE_OCB}) will only work with block cipher
+algorithms which have the block size of 16 bytes.
 
 The third argument @var{flags} can either be passed as @code{0} or as
 the bit-wise OR of the following constants.
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index f3207c9..85c6753 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -912,6 +912,7 @@ enum gcry_cipher_modes
     GCRY_CIPHER_MODE_CCM      = 8,   /* Counter with CBC-MAC.  */
     GCRY_CIPHER_MODE_GCM      = 9,   /* Galois Counter Mode. */
     GCRY_CIPHER_MODE_POLY1305 = 10,  /* Poly1305 based AEAD mode. */
+    GCRY_CIPHER_MODE_OCB      = 11   /* OCB3 mode.  */
   };
 
 /* Flags used with the open function. */

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

Summary of changes:
 doc/gcrypt.texi |   19 +++++++++++++------
 src/gcrypt.h.in |    1 +
 2 files changed, 14 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits