From: Richard Levitte <levitte@openssl.org>
Date: Thu, 20 Mar 2003 23:29:06 +0000 (+0000)
Subject: Make sure we get the definition of OPENSSL_NO_RC2.
X-Git-Tag: BEN_FIPS_TEST_1~38^2~214
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c7e7fc3ee42c03313b4957ea23db3b6f40d3affb;p=oweals%2Fopenssl.git

Make sure we get the definition of OPENSSL_NO_RC2.
---

diff --git a/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c
index d42cbfd17e..3932f60e59 100644
--- a/crypto/evp/e_rc2.c
+++ b/crypto/evp/e_rc2.c
@@ -56,10 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_RC2
-
 #include <stdio.h>
 #include "cryptlib.h"
+
+#ifndef OPENSSL_NO_RC2
+
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include "evp_locl.h"
diff --git a/crypto/rc2/rc2.h b/crypto/rc2/rc2.h
index 7816b454dc..34c8362317 100644
--- a/crypto/rc2/rc2.h
+++ b/crypto/rc2/rc2.h
@@ -59,6 +59,7 @@
 #ifndef HEADER_RC2_H
 #define HEADER_RC2_H
 
+#include <openssl/opensslconf.h> /* OPENSSL_NO_RC2, RC2_INT */
 #ifdef OPENSSL_NO_RC2
 #error RC2 is disabled.
 #endif
@@ -66,7 +67,6 @@
 #define RC2_ENCRYPT	1
 #define RC2_DECRYPT	0
 
-#include <openssl/opensslconf.h> /* RC2_INT */
 #define RC2_BLOCK	8
 #define RC2_KEY_LENGTH	16