Fixes to d2i_ASN1_OBJECT, ASN1_INTEGER_to_BN and a_strex.c

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

diff --git a/crypto/rc2/rc2.h b/crypto/rc2/rc2.h
index 2fc48f11fa7049763f1d076bea196a5c4490e7bb..076c0a067ceefe615c52442ddd77459d005e33e9 100644 (file)
--- a/crypto/rc2/rc2.h
+++ b/crypto/rc2/rc2.h
@@ -59,47 +59,40 @@
 #ifndef HEADER_RC2_H
 #define HEADER_RC2_H
 
-#ifdef  __cplusplus
-extern "C" {
+#ifdef NO_RC2
+#error RC2 is disabled.
 #endif
 
 #define RC2_ENCRYPT    1
 #define RC2_DECRYPT    0
 
-#include "opensslconf.h" /* RC2_INT */
+#include <openssl/opensslconf.h> /* RC2_INT */
 #define RC2_BLOCK      8
 #define RC2_KEY_LENGTH 16
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct rc2_key_st
        {
        RC2_INT data[64];
        } RC2_KEY;
 
-#ifndef NOPROTO
  
-void RC2_set_key(RC2_KEY *key, int len, unsigned char *data,int bits);
-void RC2_ecb_encrypt(unsigned char *in,unsigned char *out,RC2_KEY *key,
-       int enc);
+void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits);
+void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key,
+                    int enc);
 void RC2_encrypt(unsigned long *data,RC2_KEY *key);
 void RC2_decrypt(unsigned long *data,RC2_KEY *key);
-void RC2_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
+void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
        RC2_KEY *ks, unsigned char *iv, int enc);
-void RC2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       RC2_KEY *schedule, unsigned char *ivec, int *num, int enc);
-void RC2_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       RC2_KEY *schedule, unsigned char *ivec, int *num);
-
-#else
-
-void RC2_set_key();
-void RC2_ecb_encrypt();
-void RC2_encrypt();
-void RC2_decrypt();
-void RC2_cbc_encrypt();
-void RC2_cfb64_encrypt();
-void RC2_ofb64_encrypt();
-
-#endif
+void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+                      long length, RC2_KEY *schedule, unsigned char *ivec,
+                      int *num, int enc);
+void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
+                      long length, RC2_KEY *schedule, unsigned char *ivec,
+                      int *num);
 
 #ifdef  __cplusplus
 }