summaryrefslogtreecommitdiff
path: root/fips/des
diff options
context:
space:
mode:
authorsteve <steve>2011-01-27 15:22:21 +0000
committersteve <steve>2011-01-27 15:22:21 +0000
commit6d13c63ab539fcf5287829df2a1b686e15c2d3cd (patch)
tree2aa3ef992cb0e4721cc1a3ffefa50bc83bc1b1fe /fips/des
parent110ed9d354be593b38de090aea3e03cdd2aa63e6 (diff)
downloadopenssl-6d13c63ab539fcf5287829df2a1b686e15c2d3cd.tar.gz
Change OPENSSL_FIPSEVP to OPENSSL_FIPSAPI as it doesn't just refer
to EVP any more. Move locking #define into fips.h. Set FIPS locking callbacks at same time as OpenSSL locking callbacks.
Diffstat (limited to 'fips/des')
-rw-r--r--fips/des/fips_des_selftest.c2
-rw-r--r--fips/des/fips_desmovs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fips/des/fips_des_selftest.c b/fips/des/fips_des_selftest.c
index cad3270cc..d93d3b555 100644
--- a/fips/des/fips_des_selftest.c
+++ b/fips/des/fips_des_selftest.c
@@ -47,7 +47,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <string.h>
#include <openssl/err.h>
diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c
index baa0b0488..6766d1c91 100644
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -58,7 +58,7 @@
U.S.A.
----------------------------------------------*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <stdlib.h>