From: Richard Levitte <levitte@openssl.org>
Date: Fri, 8 Aug 2003 10:08:14 +0000 (+0000)
Subject: Avoid clashing with the regular DES functions when not compiling with
X-Git-Tag: OpenSSL_0_9_7c~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=94a1183fabc872c8c89a04f6d256f883e98c8e72;p=oweals%2Fopenssl.git

Avoid clashing with the regular DES functions when not compiling with
-DFIPS.  This is basically only visible when building with shared
library supoort...
---

diff --git a/fips/des/fips_des_enc.c b/fips/des/fips_des_enc.c
index 9bb3e1cb0e..e1c06e3060 100644
--- a/fips/des/fips_des_enc.c
+++ b/fips/des/fips_des_enc.c
@@ -58,6 +58,8 @@
 
 #include "fips_des_locl.h"
 
+#ifdef FIPS
+
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
 	{
 	register DES_LONG l,r,t,u;
@@ -286,3 +288,10 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
 	data[0]=l;
 	data[1]=r;
 	}
+
+#else /* ndef FIPS */
+
+static void *dummy=&dummy;
+
+#endif /* ndef FIPS */
+