OpenSSL 0.9.4 merge

1 files changed, 6 insertions, 8 deletions

diff --git a/src/lib/libcrypto/cast/c_ecb.c b/src/lib/libcrypto/cast/c_ecb.c
index f0f2f4df0e..33182f2b71 100644
--- a/src/lib/libcrypto/cast/c_ecb.c
+++ b/src/lib/libcrypto/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.0b 29-Jun-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 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);