Revert CFB block length change. Despite what SP800-38a says the input to
authorDr. Stephen Henson <steve@openssl.org>
Fri, 26 Feb 2010 14:41:48 +0000 (14:41 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 26 Feb 2010 14:41:48 +0000 (14:41 +0000)
CFB mode does *not* have to be a multiple of the block length and several
other specifications (e.g. PKCS#11) do not require this.

crypto/evp/evp_locl.h

index 22f67d4..292d74c 100644 (file)
@@ -155,9 +155,9 @@ BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \
 #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \
                             iv_len, cbits, flags, init_key, cleanup, \
                             set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \
-                       (cbits + 7)/8, key_len, iv_len, \
-               flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
+BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
+                 key_len, iv_len, flags, init_key, cleanup, set_asn1, \
+                 get_asn1, ctrl)
 
 #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \
                             iv_len, cbits, flags, init_key, cleanup, \