diff options
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/des/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/crypto/des/cbc_cksum.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index f8637a6e79..c6f7072903 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,4 @@ +<<<<<<< ChangeLog Sat Jun 15 03:51:19 1996 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in (clean): Add space before \ @@ -66,6 +67,11 @@ Thu May 2 18:29:01 1996 Richard Basch <basch@lehman.com> [3-DES uses DES3-CBC-CRC to increment a 192 bit sequence number, instead of being only as secure as DES.] +Wed Apr 17 19:25:01 1996 Marc Horowitz <marc@mit.edu> + + * cbc_cksum.c (mit_des_cbc_checksum): don't allocate the checksum + contents. The caller is supposed to do this. + Wed Apr 10 17:46:40 1996 Theodore Y. Ts'o <tytso@dcl> * Makefile.in (SRCS,OBJS): Added afsstring2key.c to the list of diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c index 9c98263a2a..c4fb8c0860 100644 --- a/src/lib/crypto/des/cbc_cksum.c +++ b/src/lib/crypto/des/cbc_cksum.c @@ -86,7 +86,6 @@ mit_des_cbc_checksum(in, in_length, key, key_size, cksum) cksum->checksum_type = CKSUMTYPE_DESCBC; cksum->length = sizeof(mit_des_cblock); - mit_des_cbc_cksum(in, cksum->contents, in_length, schedule, key); cleanup(); |