diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/crypto/aes/asm/aes-mips.pl | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/arm_arch.h | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/sha/asm/sha1-mips.pl | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/sha/asm/sha512-mips.pl | 6 |
4 files changed, 2 insertions, 18 deletions
diff --git a/lib/libssl/src/crypto/aes/asm/aes-mips.pl b/lib/libssl/src/crypto/aes/asm/aes-mips.pl index 2ce6deffc88..5307c05cac6 100644 --- a/lib/libssl/src/crypto/aes/asm/aes-mips.pl +++ b/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/lib/libssl/src/crypto/arm_arch.h b/lib/libssl/src/crypto/arm_arch.h index de46ef2c2b1..2ad95dc62ab 100644 --- a/lib/libssl/src/crypto/arm_arch.h +++ b/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/lib/libssl/src/crypto/sha/asm/sha1-mips.pl b/lib/libssl/src/crypto/sha/asm/sha1-mips.pl index f1a702f38f5..0590b7cdb2e 100644 --- a/lib/libssl/src/crypto/sha/asm/sha1-mips.pl +++ b/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/lib/libssl/src/crypto/sha/asm/sha512-mips.pl b/lib/libssl/src/crypto/sha/asm/sha512-mips.pl index ba5b250890e..2714794c2f0 100644 --- a/lib/libssl/src/crypto/sha/asm/sha512-mips.pl +++ b/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__) @@ -351,7 +347,7 @@ $code.=<<___; $ST $G,6*$SZ($ctx) $ST $H,7*$SZ($ctx) - bnel $inp,@X[15],.Loop + bne $inp,@X[15],.Loop $PTR_SUB $Ktbl,`($rounds-16)*$SZ` # rewind $Ktbl $REG_L $ra,$FRAMESIZE-1*$SZREG($sp) |