Fix for d2i_ASN1_bytes and stop PKCS#7 routines crashing is signed message

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

diff --git a/crypto/idea/idea.h b/crypto/idea/idea.h
index 41ace440d8aee0ea38484edb680cad0e4399c4d7..ae32f5692e53c1cd889ea7b9f651950de08c3e57 100644 (file)
--- a/crypto/idea/idea.h
+++ b/crypto/idea/idea.h
@@ -63,10 +63,14 @@
 extern "C" {
 #endif
 
+#ifdef NO_IDEA
+#error IDEA is disabled.
+#endif
+
 #define IDEA_ENCRYPT   1
 #define IDEA_DECRYPT   0
 
-#include "opensslconf.h" /* IDEA_INT */
+#include <openssl/opensslconf.h> /* IDEA_INT */
 #define IDEA_BLOCK     8
 #define IDEA_KEY_LENGTH        16
 
@@ -75,7 +79,6 @@ typedef struct idea_key_st
        IDEA_INT data[9][6];
        } IDEA_KEY_SCHEDULE;
 
-#ifndef NOPROTO
 const char *idea_options(void);
 void idea_ecb_encrypt(unsigned char *in, unsigned char *out,
        IDEA_KEY_SCHEDULE *ks);
@@ -89,17 +92,6 @@ void idea_cfb64_encrypt(unsigned char *in, unsigned char *out,
 void idea_ofb64_encrypt(unsigned char *in, unsigned char *out,
        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num);
 void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
-#else
-const char *idea_options();
-void idea_ecb_encrypt();
-void idea_set_encrypt_key();
-void idea_set_decrypt_key();
-void idea_cbc_encrypt();
-void idea_cfb64_encrypt();
-void idea_ofb64_encrypt();
-void idea_encrypt();
-#endif
-
 #ifdef  __cplusplus
 }
 #endif