Avoid shadowing, and a bit of constification while I'm at it.

[openssl.git] / crypto / cast / c_ecb.c

diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c
index b9d30a5b5454791116fc9ab37a2092481ab31cbe..e237ebcac43356fcb91950ad7b7d85272abfb0ea 100644 (file)
--- a/crypto/cast/c_ecb.c
+++ b/crypto/cast/c_ecb.c
@@ -56,22 +56,20 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
+#include <openssl/opensslv.h>
 
-char *CAST_version="CAST part of SSLeay 0.9.1c 22-Dec-1998";
+char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
 
-void CAST_ecb_encrypt(in, out, ks, encrypt)
-unsigned char *in;
-unsigned char *out;
-CAST_KEY *ks;
-int encrypt;
+void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
+                     CAST_KEY *ks, int _encrypt)
        {
        CAST_LONG l,d[2];
 
        n2l(in,l); d[0]=l;
        n2l(in,l); d[1]=l;
-       if (encrypt)
+       if (_encrypt)
                CAST_encrypt(d,ks);
        else
                CAST_decrypt(d,ks);