summaryrefslogtreecommitdiffstats
path: root/crypto/des/cbc3_enc.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>1999-06-09 19:28:30 +0200
committerBodo Möller <bodo@openssl.org>1999-06-09 19:28:30 +0200
commit3bcfce2881b8fa9d840e6a61d43843504064a562 (patch)
tree4208a2644e4ac31a07dee4b951d137ccbf7d7895 /crypto/des/cbc3_enc.c
parent"extern" is a C++ reserved word. (diff)
downloadopenssl-3bcfce2881b8fa9d840e6a61d43843504064a562.tar.xz
openssl-3bcfce2881b8fa9d840e6a61d43843504064a562.zip
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).
Diffstat (limited to 'crypto/des/cbc3_enc.c')
-rw-r--r--crypto/des/cbc3_enc.c6
1 files changed, 3 insertions, 3 deletions
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;