OpenSSL 0.9.4 merge

1 files changed, 4 insertions, 13 deletions

diff --git a/src/lib/libcrypto/rc5/rc5.h b/src/lib/libcrypto/rc5/rc5.h
index 5fd64e3f10..38e901502b 100644
--- a/src/lib/libcrypto/rc5/rc5.h
+++ b/src/lib/libcrypto/rc5/rc5.h
@@ -63,6 +63,10 @@
 extern "C" {
 #endif
 
+#ifdef NO_RC5
+#error RC5 is disabled.
+#endif
+
 #define RC5_ENCRYPT     1
 #define RC5_DECRYPT     0
 
@@ -88,7 +92,6 @@ 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,
         int rounds);
@@ -103,18 +106,6 @@ void RC5_32_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
 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
-
 #ifdef  __cplusplus
 }
 #endif