bsaes-armv7.pl: remove partial register operations in CTR subroutine.

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

diff --git a/crypto/cast/cast.h b/crypto/cast/cast.h
index b28e4e4f3b3c969ddfc666c981f7b7b65221f575..1a264f8143ecf35cc9777de94b3aa0f7583fe80b 100644 (file)
--- a/crypto/cast/cast.h
+++ b/crypto/cast/cast.h
@@ -63,6 +63,8 @@
 extern "C" {
 #endif
 
+#include <openssl/opensslconf.h>
+
 #ifdef OPENSSL_NO_CAST
 #error CAST is disabled.
 #endif
@@ -70,7 +72,7 @@ extern "C" {
 #define CAST_ENCRYPT   1
 #define CAST_DECRYPT   0
 
-#define CAST_LONG unsigned long
+#define CAST_LONG unsigned int
 
 #define CAST_BLOCK     8
 #define CAST_KEY_LENGTH        16
@@ -83,17 +85,17 @@ typedef struct cast_key_st
 
  
 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,
+void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const 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, const CAST_KEY *key);
+void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
 void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     CAST_KEY *ks, unsigned char *iv, int enc);
+                     const 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,
+                       long length, const 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,
+                       long length, const CAST_KEY *schedule, unsigned char *ivec,
                        int *num);
 
 #ifdef  __cplusplus