From 2d63d0c84acfdf14d4870a7d04d1b27b000e579c Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 5 Jan 2015 22:56:47 +0100 Subject: [PATCH] Fix irix-cc build. Reviewed-by: Matt Caswell (cherry picked from commit e464403d0bda2f1f74eb68582e4988e591c32433) --- crypto/aes/asm/aes-mips.pl | 2 +- crypto/dh/dh_kdf.c | 2 +- crypto/sha/asm/sha1-mips.pl | 2 +- crypto/sha/asm/sha512-mips.pl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/aes/asm/aes-mips.pl b/crypto/aes/asm/aes-mips.pl index 1fdc6bf85c..4de3ee26bb 100644 --- a/crypto/aes/asm/aes-mips.pl +++ b/crypto/aes/asm/aes-mips.pl @@ -79,7 +79,7 @@ $pf = ($flavour =~ /nubi/i) ? $t0 : $t2; # ###################################################################### -$big_endian=(`echo MIPSEL | $ENV{CC} -E -P -`=~/MIPSEL/)?1:0; +$big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC}); for (@ARGV) { $output=$_ if (/^\w[\w\-]*\.\w+$/); } open STDOUT,">$output"; diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index dbdd0b9ba6..cabc7a1260 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -131,7 +131,7 @@ static int dh_sharedinfo_encode(unsigned char **pder, unsigned char **pctr, return 0; if (!skip_asn1(&p, &tlen, V_ASN1_OCTET_STRING)) return 0; - if (memcmp(p, ctr, 4)) + if (CRYPTO_memcmp(p, ctr, 4)) return 0; *pctr = p; return derlen; diff --git a/crypto/sha/asm/sha1-mips.pl b/crypto/sha/asm/sha1-mips.pl index 73bf0609b4..3408493899 100644 --- a/crypto/sha/asm/sha1-mips.pl +++ b/crypto/sha/asm/sha1-mips.pl @@ -68,7 +68,7 @@ if ($flavour =~ /64|n32/i) { # ###################################################################### -$big_endian=(`echo MIPSEL | $ENV{CC} -E -P -`=~/MIPSEL/)?1:0; +$big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC}); for (@ARGV) { $output=$_ if (/^\w[\w\-]*\.\w+$/); } open STDOUT,">$output"; diff --git a/crypto/sha/asm/sha512-mips.pl b/crypto/sha/asm/sha512-mips.pl index 89623098d7..b468cfb456 100644 --- a/crypto/sha/asm/sha512-mips.pl +++ b/crypto/sha/asm/sha512-mips.pl @@ -72,7 +72,7 @@ $pf = ($flavour =~ /nubi/i) ? $t0 : $t2; # ###################################################################### -$big_endian=(`echo MIPSEL | $ENV{CC} -E -P -`=~/MIPSEL/)?1:0; +$big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC}); for (@ARGV) { $output=$_ if (/^\w[\w\-]*\.\w+$/); } open STDOUT,">$output"; -- 2.34.1