Commit ea050a6e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files 

Fix block_size field for CFB and OFB modes: it should be 1.
parent bde63f80

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.6h and 0.9.7  [XX xxx 2002]



  *) The "block size" for block ciphers in CFB and OFB mode should be 1.

     [Steve Henson, reported by Yngve Nysaeter Pettersen <yngve@opera.com>]



  *) Make sure tests can be performed even if the corresponding algorithms

     have been removed entirely.  This was also the last step to make

     OpenSSL compilable with DJGPP under all reasonable conditions.

crypto/evp/evp_locl.h

+6 −6
Original line number Diff line number Diff line
@@ -124,17 +124,17 @@ const EVP_CIPHER *EVP_##cname##_##mode(void) { return &cname##_##mode; } 
BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \

		  iv_len, flags, init_key, cleanup, set_asn1, get_asn1, ctrl)



#define BLOCK_CIPHER_def_cfb(cname, 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, CFB, kstruct, nid, block_size, \

BLOCK_CIPHER_def1(cname, cfb##cbits, cfb, 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, block_size, key_len, \

#define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \

			     iv_len, cbits, flags, init_key, cleanup, \

			     set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, block_size, \

BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, 1, \

		  key_len, iv_len, flags, init_key, cleanup, set_asn1, \

		  get_asn1, ctrl)
@@ -149,9 +149,9 @@ BLOCK_CIPHER_def1(cname, ecb, ecb, ECB, kstruct, nid, block_size, key_len, \ 
			  init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, iv_len, flags, \

		     init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_cfb(cname, kstruct, nid, block_size, key_len, iv_len, cbits, \

BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, iv_len, cbits, \

		     flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_ofb(cname, kstruct, nid, block_size, key_len, iv_len, cbits, \

BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, iv_len, cbits, \

		     flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \

BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, iv_len, flags, \

		     init_key, cleanup, set_asn1, get_asn1, ctrl)