Fix eckey_priv_encode()

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

diff --git a/crypto/rc5/rc5.h b/crypto/rc5/rc5.h
index 5fd64e3f103f9655288515ac6385ad0de4d0d2f4..a01b5e9f235393ea6917ab7ec857e0d270caa43b 100644 (file)
--- a/crypto/rc5/rc5.h
+++ b/crypto/rc5/rc5.h
@@ -59,15 +59,20 @@
 #ifndef HEADER_RC5_H
 #define HEADER_RC5_H
 
+#include <openssl/opensslconf.h> /* OPENSSL_NO_RC5 */
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
+#ifdef OPENSSL_NO_RC5
+#error RC5 is disabled.
+#endif
+
 #define RC5_ENCRYPT    1
 #define RC5_DECRYPT    0
 
-/* 32 bit.  For Alpha, things may get weird */
-#define RC5_32_INT unsigned long
+#define RC5_32_INT unsigned int
 
 #define RC5_32_BLOCK           8
 #define RC5_32_KEY_LENGTH      16 /* This is a default, max is 255 */
@@ -88,32 +93,22 @@ typedef struct rc5_key_st
        RC5_32_INT data[2*(RC5_16_ROUNDS+1)];
        } RC5_32_KEY;
 
-#ifndef NOPROTO
  
-void RC5_32_set_key(RC5_32_KEY *key, int len, unsigned char *data,
+void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
        int rounds);
-void RC5_32_ecb_encrypt(unsigned char *in,unsigned char *out,RC5_32_KEY *key,
+void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key,
        int enc);
 void RC5_32_encrypt(unsigned long *data,RC5_32_KEY *key);
 void RC5_32_decrypt(unsigned long *data,RC5_32_KEY *key);
-void RC5_32_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-       RC5_32_KEY *ks, unsigned char *iv, int enc);
-void RC5_32_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       RC5_32_KEY *schedule, unsigned char *ivec, int *num, int enc);
-void RC5_32_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       RC5_32_KEY *schedule, unsigned char *ivec, int *num);
-
-#else
-
-void RC5_32_set_key();
-void RC5_32_ecb_encrypt();
-void RC5_32_encrypt();
-void RC5_32_decrypt();
-void RC5_32_cbc_encrypt();
-void RC5_32_cfb64_encrypt();
-void RC5_32_ofb64_encrypt();
-
-#endif
+void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                       long length, RC5_32_KEY *ks, unsigned char *iv,
+                       int enc);
+void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+                         long length, RC5_32_KEY *schedule,
+                         unsigned char *ivec, int *num, int enc);
+void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
+                         long length, RC5_32_KEY *schedule,
+                         unsigned char *ivec, int *num);
 
 #ifdef  __cplusplus
 }