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

Correct ECB mode EVP_CIPHER definition: IV length is 0

parent 79cfc3ac

crypto/evp/evp_locl.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -167,10 +167,10 @@ BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, 1, \ 
		  get_asn1, ctrl)

		  get_asn1, ctrl)





#define BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, \

#define BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, \

			     iv_len, flags, init_key, cleanup, set_asn1, \

			     flags, init_key, cleanup, set_asn1, \

			     get_asn1, ctrl) \

			     get_asn1, ctrl) \

BLOCK_CIPHER_def1(cname, ecb, ecb, ECB, kstruct, nid, block_size, key_len, \

BLOCK_CIPHER_def1(cname, ecb, ecb, ECB, kstruct, nid, block_size, key_len, \

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

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





#define BLOCK_CIPHER_defs(cname, kstruct, \

#define BLOCK_CIPHER_defs(cname, kstruct, \

			  nid, block_size, key_len, iv_len, cbits, flags, \

			  nid, block_size, key_len, iv_len, cbits, flags, \
@@ -181,7 +181,7 @@ BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, iv_len, cbits, \ 
		     flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \

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

BLOCK_CIPHER_def_ofb(cname, kstruct, nid, 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) \

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

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

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

		     init_key, cleanup, set_asn1, get_asn1, ctrl)

		     init_key, cleanup, set_asn1, get_asn1, ctrl)