summaryrefslogtreecommitdiffstats
path: root/fips/des
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-27 15:22:26 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-27 15:22:26 +0000
commit7c8ced94c32131f24d469d2899f3339f77c47aa1 (patch)
tree7dad16d42ed83f3d03917fc25d46fefa4647a2cc /fips/des
parentd5df1b3f0db030c2202cbcc7c0ca9921d3db2ce0 (diff)
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 cad3270cc8..d93d3b5558 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 baa0b0488b..6766d1c915 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>