diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/aes/asm/aes-mips.pl | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arm_arch.h | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/asm/sha1-mips.pl | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/asm/sha512-mips.pl | 4 |
4 files changed, 1 insertions, 17 deletions
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 | |||
| 85 | 85 | ||
| 86 | $code.=<<___; | 86 | $code.=<<___; |
| 87 | .text | 87 | .text |
| 88 | #ifdef OPENSSL_FIPSCANISTER | ||
| 89 | # include <openssl/fipssyms.h> | ||
| 90 | #endif | ||
| 91 | |||
| 92 | #if !defined(__vxworks) || defined(__pic__) | 88 | #if !defined(__vxworks) || defined(__pic__) |
| 93 | .option pic2 | 89 | .option pic2 |
| 94 | #endif | 90 | #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 @@ | |||
| 1 | /* $OpenBSD: arm_arch.h,v 1.5 2014/06/13 20:47:19 miod Exp $ */ | 1 | /* $OpenBSD: arm_arch.h,v 1.6 2014/12/07 15:37:27 miod Exp $ */ |
| 2 | #ifndef __ARM_ARCH_H__ | 2 | #ifndef __ARM_ARCH_H__ |
| 3 | #define __ARM_ARCH_H__ | 3 | #define __ARM_ARCH_H__ |
| 4 | 4 | ||
| @@ -38,10 +38,6 @@ | |||
| 38 | # endif | 38 | # endif |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | #ifdef OPENSSL_FIPSCANISTER | ||
| 42 | #include <openssl/fipssyms.h> | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #if !__ASSEMBLER__ | 41 | #if !__ASSEMBLER__ |
| 46 | extern unsigned int OPENSSL_armcap_P; | 42 | extern unsigned int OPENSSL_armcap_P; |
| 47 | 43 | ||
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 | |||
| 237 | $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; | 237 | $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; |
| 238 | 238 | ||
| 239 | $code=<<___; | 239 | $code=<<___; |
| 240 | #ifdef OPENSSL_FIPSCANISTER | ||
| 241 | # include <openssl/fipssyms.h> | ||
| 242 | #endif | ||
| 243 | |||
| 244 | .text | 240 | .text |
| 245 | 241 | ||
| 246 | .set noat | 242 | .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; | |||
| 238 | $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; | 238 | $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; |
| 239 | 239 | ||
| 240 | $code.=<<___; | 240 | $code.=<<___; |
| 241 | #ifdef OPENSSL_FIPSCANISTER | ||
| 242 | # include <openssl/fipssyms.h> | ||
| 243 | #endif | ||
| 244 | |||
| 245 | .text | 241 | .text |
| 246 | .set noat | 242 | .set noat |
| 247 | #if !defined(__vxworks) || defined(__pic__) | 243 | #if !defined(__vxworks) || defined(__pic__) |
