From ca4f69ec34c4b7b4033cd7efed8a28aa3773406b Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Thu, 31 May 2001 17:34:39 +0000 Subject: [PATCH] * f_cbc.c (mit_des_cbc_encrypt): Do not use a variable named "encrypt". * d3_cbc.c (mit_des3_cbc_encrypt): Likewise. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13251 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/des/ChangeLog | 3 +++ src/lib/crypto/des/d3_cbc.c | 6 +++--- src/lib/crypto/des/f_cbc.c | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index e13c4e59f..59e124871 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,5 +1,8 @@ 2001-05-31 Ezra Peisach + * f_cbc.c (mit_des_cbc_encrypt): Do not use a variable named "encrypt". + * d3_cbc.c (mit_des3_cbc_encrypt): Likewise. + * des_int.h (mit_des_cbc_encrypt, mit_des3_ecb_encrypt, mit_des3_cbc_encrypt): Don't use "encrypt" as argument name. diff --git a/src/lib/crypto/des/d3_cbc.c b/src/lib/crypto/des/d3_cbc.c index 84d0af39a..ca5b075c2 100644 --- a/src/lib/crypto/des/d3_cbc.c +++ b/src/lib/crypto/des/d3_cbc.c @@ -28,13 +28,13 @@ */ int -mit_des3_cbc_encrypt(in, out, length, ks1, ks2, ks3, ivec, encrypt) +mit_des3_cbc_encrypt(in, out, length, ks1, ks2, ks3, ivec, enc) const mit_des_cblock FAR *in; mit_des_cblock FAR *out; unsigned long length; const mit_des_key_schedule ks1, ks2, ks3; const mit_des_cblock ivec; - int encrypt; + int enc; { register unsigned DES_INT32 left, right; register unsigned DES_INT32 temp; @@ -52,7 +52,7 @@ mit_des3_cbc_encrypt(in, out, length, ks1, ks2, ks3, ivec, encrypt) /* * Deal with encryption and decryption separately. */ - if (encrypt) { + if (enc) { /* * Initialize left and right with the contents of the initial * vector. diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c index b6443328c..e02d0bffa 100644 --- a/src/lib/crypto/des/f_cbc.c +++ b/src/lib/crypto/des/f_cbc.c @@ -37,13 +37,13 @@ */ int -mit_des_cbc_encrypt(in, out, length, schedule, ivec, encrypt) +mit_des_cbc_encrypt(in, out, length, schedule, ivec, enc) const mit_des_cblock FAR *in; mit_des_cblock FAR *out; unsigned long length; const mit_des_key_schedule schedule; const mit_des_cblock ivec; - int encrypt; + int enc; { register unsigned DES_INT32 left, right; register unsigned DES_INT32 temp; @@ -59,7 +59,7 @@ mit_des_cbc_encrypt(in, out, length, schedule, ivec, encrypt) /* * Deal with encryption and decryption separately. */ - if (encrypt) { + if (enc) { /* * Initialize left and right with the contents of the initial * vector. -- 2.26.2