From 608217d8d0b0fd07e28e7a1e687ec19f550edb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20M=C3=B6ller?= Date: Thu, 13 May 1999 17:51:35 +0000 Subject: [PATCH] Don't use reserved name "_encrypt" for parameters; 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 | 4 ++-- crypto/cast/c_ecb.c | 4 ++-- crypto/cast/c_enc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crypto/cast/c_cfb64.c b/crypto/cast/c_cfb64.c index 095e05a563..514c005c32 100644 --- a/crypto/cast/c_cfb64.c +++ b/crypto/cast/c_cfb64.c @@ -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--) { diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c index e237ebcac4..33182f2b71 100644 --- a/crypto/cast/c_ecb.c +++ b/crypto/cast/c_ecb.c @@ -63,13 +63,13 @@ 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); diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c index ef70c88981..0fe2cffecc 100644 --- a/crypto/cast/c_enc.c +++ b/crypto/cast/c_enc.c @@ -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); -- GitLab