From 3bcfce2881b8fa9d840e6a61d43843504064a562 Mon Sep 17 00:00:00 2001 From: Bodo Möller Date: Wed, 9 Jun 1999 17:28:30 +0000 Subject: Unify DES library: ncbc_enc.c wasn't used, but its content was almost duplicated in cbc_enc.c (without IV updating) and in des_enc.c As pointed out by others on the openssl-dev list, des_cbc_encrypt (without IV updating; defined in cbc_enc.c) exists only for historical reasons: des_ncbc_encrypt should be used instead (and the caller does not have to manually update the IV). If des_cbc_enrypt is not needed for backwards compatibility, the definition of des_ncbc_encrypt should be put back into des_enc.c, and both cbc_enc.c and ncbc_enc.c can be deleted. If des_cbc_encrypt *is* needed for backwards compatibility, its behaviour obviously should not change (i.e., don't add IV updating). --- crypto/des/cbc3_enc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/des/cbc3_enc.c') diff --git a/crypto/des/cbc3_enc.c b/crypto/des/cbc3_enc.c index 50ed156c7a..3863a676d4 100644 --- a/crypto/des/cbc3_enc.c +++ b/crypto/des/cbc3_enc.c @@ -59,9 +59,9 @@ #include "des_locl.h" /* HAS BUGS? DON'T USE - this is only present for use in des.c */ -void des_3cbc_encrypt(des_cblock (*input), des_cblock (*output), long length, - des_key_schedule ks1, des_key_schedule ks2, des_cblock (*iv1), - des_cblock (*iv2), int enc) +void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length, + des_key_schedule ks1, des_key_schedule ks2, des_cblock *iv1, + des_cblock *iv2, int enc) { int off=((int)length-1)/8; long l8=((length+7)/8)*8; -- cgit v1.2.3