* des.c (des_ecb_encrypt): Do not use a variable named "encrypt".

	* enc_dec.c (des_cbc_encrypt): Likewise.
	* pcbc_encrypt.c (des_pcbc_encrypt): Likewise.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13255 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 15 insertions, 9 deletions

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index ec34efe..cb88239 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-31  Ezra Peisach  <epeisach@mit.edu>
+
+	* des.c (des_ecb_encrypt): Do not use a variable named "encrypt".
+	* enc_dec.c (des_cbc_encrypt): Likewise.
+	* pcbc_encrypt.c (des_pcbc_encrypt): Likewise.
+
 2001-04-26  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Don't use HAS_ANSI_VOLATILE.
diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index e4fc70b..0be0973 100644
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -30,15 +30,15 @@
 #include "des.h"
 
 KRB5_DLLIMP int KRB5_CALLCONV
-des_ecb_encrypt(clear, cipher, schedule, encrypt)
+des_ecb_encrypt(clear, cipher, schedule, enc)
     unsigned long *clear;
     unsigned long *cipher;
     const mit_des_key_schedule schedule;
-    int encrypt;		/* 0 ==> decrypt, else encrypt */
+    int enc;		/* 0 ==> decrypt, else encrypt */
 {
     const static des_cblock iv;
 
     return (mit_des_cbc_encrypt((const des_cblock *) clear,
 				(des_cblock *) cipher,
-				8, schedule, iv, encrypt));
+				8, schedule, iv, enc));
 }
diff --git a/src/lib/des425/enc_dec.c b/src/lib/des425/enc_dec.c
index 653ae96..f7e4ac8 100644
--- a/src/lib/des425/enc_dec.c
+++ b/src/lib/des425/enc_dec.c
@@ -31,16 +31,16 @@
 #include "des.h"
 
 int
-des_cbc_encrypt(in,out,length,key,iv,encrypt)
+des_cbc_encrypt(in,out,length,key,iv,enc)
     krb5_octet   *in;	/* >= length bytes of input text */
     krb5_octet  *out;		/* >= length bytes of output text */
     register unsigned long length;	/* in bytes */
     const mit_des_key_schedule key;		/* precomputed key schedule */
     const krb5_octet *iv;		/* 8 bytes of ivec */
-    int encrypt;		/* 0 ==> decrypt, else encrypt */
+    int enc;		/* 0 ==> decrypt, else encrypt */
 {
 	return (mit_des_cbc_encrypt((const des_cblock *) in,
                                 (des_cblock *) out,
-                                length, key, iv, encrypt));
+                                length, key, iv, enc));
 }
 
diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c
index d150af5..6aa6fd2 100644
--- a/src/lib/des425/pcbc_encrypt.c
+++ b/src/lib/des425/pcbc_encrypt.c
@@ -23,13 +23,13 @@
  * des_pcbc_encrypt - {en,de}crypt a stream in PCBC mode
  */
 KRB5_DLLIMP int KRB5_CALLCONV
-des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt)
+des_pcbc_encrypt(in, out, length, schedule, ivec, enc)
 	des_cblock *in;
 	des_cblock *out;
 	long length;
 	const des_key_schedule schedule;
 	des_cblock *ivec;
-	int encrypt;
+	int enc;
 {
 	register unsigned DES_INT32 left, right;
 	register unsigned DES_INT32 temp;
@@ -45,7 +45,7 @@ des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt)
 	/*
 	 * Deal with encryption and decryption separately.
 	 */
-	if (encrypt) {
+	if (enc) {
 		/* Initialization isn't really needed here, but gcc
 		   complains because it doesn't understand that the
 		   only case where these can be used uninitialized is