summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/crypto/des/ChangeLog3
-rw-r--r--src/lib/crypto/des/d3_cbc.c6
-rw-r--r--src/lib/crypto/des/f_cbc.c6
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 <epeisach@mit.edu>
+ * 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.