In Message-ID: <003201bfb332$14a07520$0801a8c0@janm.transactionsite.com>,

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

diff --git a/crypto/rc2/rc2.h b/crypto/rc2/rc2.h
index 507a89698ef5e2726d34dcc8a7b01d31dee4809b..099bc31b66b99611bcc2860a687ba43b6f16da46 100644 (file)
--- a/crypto/rc2/rc2.h
+++ b/crypto/rc2/rc2.h
@@ -1,4 +1,4 @@
-/* crypto/rc2/rc2.org */
+/* crypto/rc2/rc2.h */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -59,23 +59,26 @@
 #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,
@@ -89,18 +92,6 @@ void RC2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
 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
-
 #ifdef  __cplusplus
 }
 #endif