projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
30e4269
)
Avoid clashing with the regular DES functions when not compiling with
author
Richard Levitte
<levitte@openssl.org>
Fri, 8 Aug 2003 10:08:14 +0000
(10:08 +0000)
committer
Richard Levitte
<levitte@openssl.org>
Fri, 8 Aug 2003 10:08:14 +0000
(10:08 +0000)
-DFIPS. This is basically only visible when building with shared
library supoort...
fips/des/fips_des_enc.c
patch
|
blob
|
history
diff --git
a/fips/des/fips_des_enc.c
b/fips/des/fips_des_enc.c
index 9bb3e1cb0eddd1e02d0f4322c9f4c9b2a4769097..e1c06e3060af8c3233456fb3605753fd48cdb6e5 100644
(file)
--- 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 */
+