Don't use reserved name "_encrypt" for parameters;
authorBodo Möller <bodo@openssl.org>
Thu, 13 May 1999 17:51:35 +0000 (17:51 +0000)
committerBodo Möller <bodo@openssl.org>
Thu, 13 May 1999 17:51:35 +0000 (17:51 +0000)
instead I've picked "enc", because that's what's in the prototypes.
("_encrypt" is reserved only as an external name, but still
using it in an application doesn't look like good style to me --
and it certainly isn't if the point is just avoiding shadowing,
which is apparently why the previous name "encrypt" was changed.)

crypto/cast/c_cfb64.c
crypto/cast/c_ecb.c
crypto/cast/c_enc.c

index 095e05a..514c005 100644 (file)
@@ -66,7 +66,7 @@
 
 void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
                        long length, CAST_KEY *schedule, unsigned char *ivec,
-                       int *num, int _encrypt)
+                       int *num, int enc)
        {
        register CAST_LONG v0,v1,t;
        register int n= *num;
@@ -75,7 +75,7 @@ void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
        unsigned char *iv,c,cc;
 
        iv=ivec;
-       if (_encrypt)
+       if (enc)
                {
                while (l--)
                        {
index e237ebc..33182f2 100644 (file)
 char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
 
 void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     CAST_KEY *ks, int _encrypt)
+                     CAST_KEY *ks, int enc)
        {
        CAST_LONG l,d[2];
 
        n2l(in,l); d[0]=l;
        n2l(in,l); d[1]=l;
-       if (_encrypt)
+       if (enc)
                CAST_encrypt(d,ks);
        else
                CAST_decrypt(d,ks);
index ef70c88..0fe2cff 100644 (file)
@@ -124,14 +124,14 @@ void CAST_decrypt(CAST_LONG *data, CAST_KEY *key)
        }
 
 void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-            CAST_KEY *ks, unsigned char *iv, int _encrypt)
+            CAST_KEY *ks, unsigned char *iv, int enc)
        {
        register CAST_LONG tin0,tin1;
        register CAST_LONG tout0,tout1,xor0,xor1;
        register long l=length;
        CAST_LONG tin[2];
 
-       if (_encrypt)
+       if (enc)
                {
                n2l(iv,tout0);
                n2l(iv,tout1);