[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  e464403d0bda2f1f74eb68582e4988e591c32433 (commit)
      from  4138e3882556c762d77eb827b8be98507cde48df (commit)


- Log -----------------------------------------------------------------
commit e464403d0bda2f1f74eb68582e4988e591c32433
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Jan 5 22:56:47 2015 +0100

    Fix irix-cc build.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 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 1d8afe9..a82d8af 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 dbdd0b9..cabc7a1 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 73bf060..3408493 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 8962309..b468cfb 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";