summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/crypto/enc_provider/ChangeLog5
-rw-r--r--src/lib/crypto/enc_provider/des.c4
-rw-r--r--src/lib/crypto/enc_provider/des3.c4
3 files changed, 9 insertions, 4 deletions
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));