This patch was "ignited" by OpenBSD 3>=4 support. They've switched to ELF

[openssl.git] / crypto / cast / cast.h

diff --git a/crypto/cast/cast.h b/crypto/cast/cast.h
index 215356dbe4aad46ec030f51585f9fe889632be32..90b45b950aa8dcbc2b2156c3523c8a337281b3d3 100644 (file)
--- a/crypto/cast/cast.h
+++ b/crypto/cast/cast.h
@@ -63,7 +63,9 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-#ifdef NO_CAST
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_CAST

 #error CAST is disabled.
 #endif
 
 #error CAST is disabled.
 #endif
 


@@ -82,17 +84,19 @@ typedef struct cast_key_st
        } CAST_KEY;
 
  
        } CAST_KEY;
 
  

-void CAST_set_key(CAST_KEY *key, int len, unsigned char *data);
-void CAST_ecb_encrypt(unsigned char *in,unsigned char *out,CAST_KEY *key,
-       int enc);
+void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
+void CAST_ecb_encrypt(const unsigned char *in,unsigned char *out,CAST_KEY *key,
+                     int enc);

 void CAST_encrypt(CAST_LONG *data,CAST_KEY *key);
 void CAST_decrypt(CAST_LONG *data,CAST_KEY *key);
 void CAST_encrypt(CAST_LONG *data,CAST_KEY *key);
 void CAST_decrypt(CAST_LONG *data,CAST_KEY *key);

-void CAST_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-       CAST_KEY *ks, unsigned char *iv, int enc);
-void CAST_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       CAST_KEY *schedule, unsigned char *ivec, int *num, int enc);
-void CAST_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       CAST_KEY *schedule, unsigned char *ivec, int *num);
+void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+                     CAST_KEY *ks, unsigned char *iv, int enc);
+void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+                       long length, CAST_KEY *schedule, unsigned char *ivec,
+                       int *num, int enc);
+void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, 
+                       long length, CAST_KEY *schedule, unsigned char *ivec,
+                       int *num);

 
 #ifdef  __cplusplus
 }
 
 #ifdef  __cplusplus
 }