From: Ezra Peisach <epeisach@mit.edu>
Date: Thu, 31 May 2001 17:36:30 +0000 (+0000)
Subject: 	* des.c (k5_des_docrypt): Do not use a variable named "encrypt"
X-Git-Tag: krb5-1.3-alpha1~1502
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74cb95ef885ce5e5b20afeeb79cafdf3004611e4;p=krb5.git

	* des.c (k5_des_docrypt): Do not use a variable named "encrypt"
	* des3.c (k5_des3_docrypt): Likewise.

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

diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog
index 7c9c1b049..6a63ec8a7 100644
--- a/src/lib/crypto/enc_provider/ChangeLog
+++ b/src/lib/crypto/enc_provider/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-31  Ezra Peisach  <epeisach@mit.edu>
+
+	* des.c (k5_des_docrypt): Do not use a variable named "encrypt"
+	* des3.c (k5_des3_docrypt): Likewise.
+
 2001-04-10  Ken Raeburn  <raeburn@mit.edu>
 
 	* des.c (k5_des_docrypt): Add casts when mixing pointer types with
diff --git a/src/lib/crypto/enc_provider/des.c b/src/lib/crypto/enc_provider/des.c
index 90cf6d01f..e12ddcdc9 100644
--- a/src/lib/crypto/enc_provider/des.c
+++ b/src/lib/crypto/enc_provider/des.c
@@ -45,7 +45,7 @@ k5_des_keysize(size_t *keybytes, size_t *keylength)
 
 static krb5_error_code
 k5_des_docrypt(const krb5_keyblock *key, const krb5_data *ivec,
-	       const krb5_data *input, krb5_data *output, int encrypt)
+	       const krb5_data *input, krb5_data *output, int enc)
 {
     mit_des_key_schedule schedule;
 
@@ -75,7 +75,7 @@ k5_des_docrypt(const krb5_keyblock *key, const krb5_data *ivec,
 			(ivec
 			 ? (unsigned char *) ivec->data
 			 : (unsigned char *) mit_des_zeroblock),
-			encrypt);
+			enc);
 
     memset(schedule, 0, sizeof(schedule));
 
diff --git a/src/lib/crypto/enc_provider/des3.c b/src/lib/crypto/enc_provider/des3.c
index 965032923..5f638fdba 100644
--- a/src/lib/crypto/enc_provider/des3.c
+++ b/src/lib/crypto/enc_provider/des3.c
@@ -44,7 +44,7 @@ k5_des3_keysize(size_t *keybytes, size_t *keylength)
 
 static krb5_error_code
 k5_des3_docrypt(const krb5_keyblock *key, const krb5_data *ivec,
-		const krb5_data *input, krb5_data *output, int encrypt)
+		const krb5_data *input, krb5_data *output, int enc)
 {
     mit_des3_key_schedule schedule;
 
@@ -73,7 +73,7 @@ k5_des3_docrypt(const krb5_keyblock *key, const krb5_data *ivec,
 			 (krb5_pointer) output->data, input->length,
 			 schedule[0], schedule[1], schedule[2],
 			 ivec?(unsigned char *) ivec->data:(unsigned char *)mit_des_zeroblock,
-			 encrypt);
+			 enc);
 
     memset(schedule, 0, sizeof(schedule));