summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2006-03-07 19:26:21 +0000
committerWerner Koch <wk@gnupg.org>2006-03-07 19:26:21 +0000
commit5f2cbce7203a29440f37cd118df085de07d5032a (patch)
treeaf98a5081484e8ca9c9f64c4550758834b9a3455 /doc
parent1c54491d985f9a4637426fe285920df7e0010ae3 (diff)
downloadlibgcrypt-5f2cbce7203a29440f37cd118df085de07d5032a.tar.gz
Applied OFB mode patch by Brad Harris
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/gcrypt.texi12
2 files changed, 13 insertions, 4 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 797396d0..e0b54115 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-18 Brad Hards <bradh@frogmouth.net> (wk 2006-03-07)
+
+ * gcrypt.texi (Available cipher modes): Typo fix, add a little
+ more detail on cipher modes vs cipher algorithms.
+
2006-01-08 Moritz Schulte <moritz@g10code.com>
* gcrypt.texi: Added documentation for more gcry_control commands.
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index 907f7bb2..fa32a3ab 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -12,7 +12,7 @@ This manual is for Libgcrypt
(version @value{VERSION}, @value{UPDATED}),
which is GNU's library of cryptographic building blocks.
-Copyright @copyright{} 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -1318,7 +1318,7 @@ Cipher Block Chaining mode.
Stream mode, only to be used with stream cipher algorithms.
@item GCRY_CIPHER_MODE_OFB
-Outer Feedback mode.
+Output Feedback mode.
@item GCRY_CIPHER_MODE_CTR
Counter mode.
@@ -1347,8 +1347,12 @@ an algorithm into the according numeric ID.
The cipher mode to use must be specified via @var{mode}. See
@xref{Available cipher modes}, for a list of supported cipher modes
-and the according constants. Note, that some modes do not work
-together with all algorithms.
+and the according constants. Note that some modes are incompatible
+with some algorithms - in particular, stream mode
+(GCRY_CIPHER_MODE_STREAM) only works with stream ciphers. Any block
+cipher mode (GCRY_CIPHER_MODE_ECB, GCRY_CIPHER_MODE_CBC,
+GCRY_CIPHER_MODE_CFB, GCRY_CIPHER_MODE_OFB or GCRY_CIPHER_MODE_CTR)
+will work with any block cipher algorithm.
The third argument @var{flags} can either be passed as @code{0} or as
the bit-wise OR of the following constants.