[CRYPTO]: minor updates

- Fixed min keysize bug for Blowfish (it is 32, not 64).
- Documentation updates.

diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt
index 079b28602cf7c983a8a6ca8fe8cd97db7e92a344..dfa99e5ce1361325f2a4b36683a42f43741776d5 100644 (file)
--- a/Documentation/crypto/api-intro.txt
+++ b/Documentation/crypto/api-intro.txt
@@ -105,6 +105,10 @@ Also check for any RFCs which may relate to the use of specific algorithms,
 as well as general application notes such as RFC2451 ("The ESP CBC-Mode
 Cipher Algorithms").
 
+It's a good idea to avoid using lots of macros and use inlined functions
+instead, as gcc does a good job with inlining, while excessive use of
+macros can cause compilation problems on some platforms.
+
 
 BUGS
 
@@ -167,7 +171,7 @@ Original developers of the initial set of crypto algorithms:
   Dana L. How (DES)
   Andrew Tridgell and Steve French (MD4)
   Colin Plumb (MD5)
-  Steve Raid (SHA1)
+  Steve Reid (SHA1)
   Jean-Luc Cooke (SHA256)
   Kazunori Miyazawa / USAGI (HMAC)
 

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9183b3fe52ae22b63fd38b3639b99cc9bab18062..f09c10bcfe6b28a837692730a58526071cfae18a 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -55,9 +55,9 @@ config CRYPTO_BLOWFISH
        help
          Blowfish cipher algorithm, by Bruce Schneier.
          
-         This is a fast cipher which can use variable length key from 32
-         bits to 448 bits.  It's fast, simple and specifically designed for
-         use on "large microprocessors".
+         This is a variable key length cipher which can use keys from 32
+         bits to 448 bits in length.  It's fast, simple and specifically
+         designed for use on "large microprocessors".
          
          See also:
          http://www.counterpane.com/blowfish.html

diff --git a/crypto/blowfish.c b/crypto/blowfish.c
index 43895f856546b63271314e09a2bf855556550849..54e98a86b248d71152ac39147b2679cece3abce0 100644 (file)
--- a/crypto/blowfish.c
+++ b/crypto/blowfish.c
@@ -23,7 +23,7 @@
 #include <linux/crypto.h>
 
 #define BF_BLOCK_SIZE 8
-#define BF_MIN_KEY_SIZE 8
+#define BF_MIN_KEY_SIZE 4
 #define BF_MAX_KEY_SIZE 56
 
 struct bf_ctx {

diff --git a/crypto/sha1.c b/crypto/sha1.c
index 5db7a864a1f24234f440dcce9f8f7d3990670fc2..f3a56d838ea4ea3d29eb173a2ca8a91024faebe2 100644 (file)
--- a/crypto/sha1.c
+++ b/crypto/sha1.c
@@ -5,7 +5,7 @@
  *
  * Derived from cryptoapi implementation, adapted for in-place
  * scatterlist interface.  Originally based on the public domain
- * implementation written by Steve Raid.
+ * implementation written by Steve Reid.
  *
  * Copyright (c) Alan Smithee.
  * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>