From c5d806aeb78b89821adae9ac2e4e491afb82b501 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 7 Dec 2014 15:37:27 +0000
Subject: Remove OPENSSL_FIPSCANISTER mentions.

---
 src/lib/libcrypto/aes/asm/aes-mips.pl            | 4 ----
 src/lib/libcrypto/arm_arch.h                     | 6 +-----
 src/lib/libcrypto/sha/asm/sha1-mips.pl           | 4 ----
 src/lib/libcrypto/sha/asm/sha512-mips.pl         | 4 ----
 src/lib/libssl/src/crypto/aes/asm/aes-mips.pl    | 4 ----
 src/lib/libssl/src/crypto/arm_arch.h             | 6 +-----
 src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl   | 4 ----
 src/lib/libssl/src/crypto/sha/asm/sha512-mips.pl | 4 ----
 8 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/aes/asm/aes-mips.pl b/src/lib/libcrypto/aes/asm/aes-mips.pl
index 2ce6deffc8..5307c05cac 100644
--- a/src/lib/libcrypto/aes/asm/aes-mips.pl
+++ b/src/lib/libcrypto/aes/asm/aes-mips.pl
@@ -85,10 +85,6 @@ my ($MSB,$LSB)=(0,3);	# automatically converted to little-endian
 
 $code.=<<___;
 .text
-#ifdef OPENSSL_FIPSCANISTER
-# include <openssl/fipssyms.h>
-#endif
-
 #if !defined(__vxworks) || defined(__pic__)
 .option	pic2
 #endif
diff --git a/src/lib/libcrypto/arm_arch.h b/src/lib/libcrypto/arm_arch.h
index de46ef2c2b..2ad95dc62a 100644
--- a/src/lib/libcrypto/arm_arch.h
+++ b/src/lib/libcrypto/arm_arch.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: arm_arch.h,v 1.5 2014/06/13 20:47:19 miod Exp $ */
+/* $OpenBSD: arm_arch.h,v 1.6 2014/12/07 15:37:27 miod Exp $ */
 #ifndef __ARM_ARCH_H__
 #define __ARM_ARCH_H__
 
@@ -38,10 +38,6 @@
 # endif
 #endif
 
-#ifdef OPENSSL_FIPSCANISTER
-#include <openssl/fipssyms.h>
-#endif
-
 #if !__ASSEMBLER__
 extern unsigned int OPENSSL_armcap_P;
 
diff --git a/src/lib/libcrypto/sha/asm/sha1-mips.pl b/src/lib/libcrypto/sha/asm/sha1-mips.pl
index f1a702f38f..0590b7cdb2 100644
--- a/src/lib/libcrypto/sha/asm/sha1-mips.pl
+++ b/src/lib/libcrypto/sha/asm/sha1-mips.pl
@@ -237,10 +237,6 @@ $FRAMESIZE=16;	# large enough to accomodate NUBI saved registers
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000;
 
 $code=<<___;
-#ifdef OPENSSL_FIPSCANISTER
-# include <openssl/fipssyms.h>
-#endif
-
 .text
 
 .set	noat
diff --git a/src/lib/libcrypto/sha/asm/sha512-mips.pl b/src/lib/libcrypto/sha/asm/sha512-mips.pl
index ffa053bb7d..2714794c2f 100644
--- a/src/lib/libcrypto/sha/asm/sha512-mips.pl
+++ b/src/lib/libcrypto/sha/asm/sha512-mips.pl
@@ -238,10 +238,6 @@ $FRAMESIZE=16*$SZ+16*$SZREG;
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000;
 
 $code.=<<___;
-#ifdef OPENSSL_FIPSCANISTER
-# include <openssl/fipssyms.h>
-#endif
-
 .text
 .set	noat
 #if !defined(__vxworks) || defined(__pic__)
diff --git a/src/lib/libssl/src/crypto/aes/asm/aes-mips.pl b/src/lib/libssl/src/crypto/aes/asm/aes-mips.pl
index 2ce6deffc8..5307c05cac 100644
--- a/src/lib/libssl/src/crypto/aes/asm/aes-mips.pl
+++ b/src/lib/libssl/src/crypto/aes/asm/aes-mips.pl
@@ -85,10 +85,6 @@ my ($MSB,$LSB)=(0,3);	# automatically converted to little-endian
 
 $code.=<<___;
 .text
-#ifdef OPENSSL_FIPSCANISTER
-# include <openssl/fipssyms.h>
-#endif
-
 #if !defined(__vxworks) || defined(__pic__)
 .option	pic2
 #endif
diff --git a/src/lib/libssl/src/crypto/arm_arch.h b/src/lib/libssl/src/crypto/arm_arch.h
index de46ef2c2b..2ad95dc62a 100644
--- a/src/lib/libssl/src/crypto/arm_arch.h
+++ b/src/lib/libssl/src/crypto/arm_arch.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: arm_arch.h,v 1.5 2014/06/13 20:47:19 miod Exp $ */
+/* $OpenBSD: arm_arch.h,v 1.6 2014/12/07 15:37:27 miod Exp $ */
 #ifndef __ARM_ARCH_H__
 #define __ARM_ARCH_H__
 
@@ -38,10 +38,6 @@
 # endif
 #endif
 
-#ifdef OPENSSL_FIPSCANISTER
-#include <openssl/fipssyms.h>
-#endif
-
 #if !__ASSEMBLER__
 extern unsigned int OPENSSL_armcap_P;
 
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl
index f1a702f38f..0590b7cdb2 100644
--- a/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl
@@ -237,10 +237,6 @@ $FRAMESIZE=16;	# large enough to accomodate NUBI saved registers
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000;
 
 $code=<<___;
-#ifdef OPENSSL_FIPSCANISTER
-# include <openssl/fipssyms.h>
-#endif
-
 .text
 
 .set	noat
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha512-mips.pl b/src/lib/libssl/src/crypto/sha/asm/sha512-mips.pl
index ffa053bb7d..2714794c2f 100644
--- a/src/lib/libssl/src/crypto/sha/asm/sha512-mips.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha512-mips.pl
@@ -238,10 +238,6 @@ $FRAMESIZE=16*$SZ+16*$SZREG;
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000;
 
 $code.=<<___;
-#ifdef OPENSSL_FIPSCANISTER
-# include <openssl/fipssyms.h>
-#endif
-
 .text
 .set	noat
 #if !defined(__vxworks) || defined(__pic__)
-- 
cgit v1.2.3-55-g6feb