summaryrefslogtreecommitdiff
path: root/lib/libcrypto/sha/asm
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-12-07 15:37:28 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-12-07 15:37:28 +0000
commite2a8d6fb6a10014960e88e16899a0265c82c1c0b (patch)
treebf58de5046fba69d3153dd6ac723d4e2cd419e8b /lib/libcrypto/sha/asm
parenta12c6bf533b0c8f1c6c2b522678dc0950fb37963 (diff)
Remove OPENSSL_FIPSCANISTER mentions.
Diffstat (limited to 'lib/libcrypto/sha/asm')
-rw-r--r--lib/libcrypto/sha/asm/sha1-mips.pl4
-rw-r--r--lib/libcrypto/sha/asm/sha512-mips.pl6
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/libcrypto/sha/asm/sha1-mips.pl b/lib/libcrypto/sha/asm/sha1-mips.pl
index f1a702f38f5..0590b7cdb2e 100644
--- a/lib/libcrypto/sha/asm/sha1-mips.pl
+++ b/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/lib/libcrypto/sha/asm/sha512-mips.pl b/lib/libcrypto/sha/asm/sha512-mips.pl
index ba5b250890e..2714794c2f0 100644
--- a/lib/libcrypto/sha/asm/sha512-mips.pl
+++ b/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__)
@@ -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)