summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2011-08-12 21:38:19 +0000
committerAndy Polyakov <appro@openssl.org>2011-08-12 21:38:19 +0000
commitae8b47f07f70c9a7debf43d2cd8d7fd2c05aee51 (patch)
tree2d4e41b225ce45c8b3b86361603c35ec31b17f25 /crypto
parent272ba8701715aa8a9dd8f2b9eabd9bcd2e3356a6 (diff)
SPARC assembler pack: fix FIPS linking errors.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/bn/asm/sparcv8plus.S4
-rw-r--r--crypto/des/asm/des_enc.m44
-rw-r--r--crypto/sparccpuid.S4
3 files changed, 12 insertions, 0 deletions
diff --git a/crypto/bn/asm/sparcv8plus.S b/crypto/bn/asm/sparcv8plus.S
index 63de1860f2..b45bc24088 100644
--- a/crypto/bn/asm/sparcv8plus.S
+++ b/crypto/bn/asm/sparcv8plus.S
@@ -144,6 +144,10 @@
* }
*/
+#ifdef OPENSSL_FIPSCANISTER
+#include <openssl/fipssyms.h>
+#endif
+
#if defined(__SUNPRO_C) && defined(__sparcv9)
/* They've said -xarch=v9 at command line */
.register %g2,#scratch
diff --git a/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4
index 3280595478..5d323d02c5 100644
--- a/crypto/des/asm/des_enc.m4
+++ b/crypto/des/asm/des_enc.m4
@@ -46,6 +46,10 @@
.ident "des_enc.m4 2.1"
.file "des_enc-sparc.S"
+#ifdef OPENSSL_FIPSCANISTER
+#include <openssl/fipssyms.h>
+#endif
+
#if defined(__SUNPRO_C) && defined(__sparcv9)
# define ABI64 /* They've said -xarch=v9 at command line */
#elif defined(__GNUC__) && defined(__arch64__)
diff --git a/crypto/sparccpuid.S b/crypto/sparccpuid.S
index 329efcdd3d..ccdd31e041 100644
--- a/crypto/sparccpuid.S
+++ b/crypto/sparccpuid.S
@@ -1,3 +1,7 @@
+#ifdef OPENSSL_FIPSCANISTER
+#include <openssl/fipssyms.h>
+#endif
+
#if defined(__SUNPRO_C) && defined(__sparcv9)
# define ABI64 /* They've said -xarch=v9 at command line */
#elif defined(__GNUC__) && defined(__arch64__)