[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  d11582f133bf49d47054b97a0406b13fbeecbdef (commit)
       via  c4cd8316068f1c3b5a0050e60b3ea21a20db276e (commit)
      from  82c4a079395223c0063100854a0981976db9848f (commit)


- Log -----------------------------------------------------------------
commit d11582f133bf49d47054b97a0406b13fbeecbdef
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Apr 21 09:13:27 2015 +0200

    Configurations/10-main.conf: update iOS commentary.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit c4cd8316068f1c3b5a0050e60b3ea21a20db276e
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Apr 20 23:18:08 2015 +0200

    aes/asm/bsaes-armv7.pl: fix compilation with Xcode 6.3.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configurations/10-main.conf   | 2 +-
 crypto/aes/asm/bsaes-armv7.pl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 372080c..1d1a212 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1388,7 +1388,7 @@
         inherit_from     => [ "darwin-common", asm("armv4_asm") ],
         # It should be possible to go below iOS 6 and even add -arch armv6,
         # thus targeting iPhone pre-3GS, but it's assumed to be irrelevant
-        # at this point (and impossible to download SDK for).
+        # at this point.
         cflags           => "-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
         sys_id           => "iOS",
         perlasm_scheme   => "ios32",
diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
index 043fa38..f9293d5 100644
--- a/crypto/aes/asm/bsaes-armv7.pl
+++ b/crypto/aes/asm/bsaes-armv7.pl
@@ -1417,7 +1417,7 @@ bsaes_ctr32_encrypt_blocks:
 
 	vld1.8	{@XMM[0]}, [$ctr]		@ load counter
 #ifdef	__APPLE__
-	mov	$ctr, #.LREVM0SR-.LM0
+	mov	$ctr, #:lower16:(.LREVM0SR-.LM0)
 	add	$ctr, $const, $ctr
 #else
 	add	$ctr, $const, #.LREVM0SR-.LM0	@ borrow $ctr
@@ -1479,7 +1479,7 @@ bsaes_ctr32_encrypt_blocks:
 	mov		r5, $rounds			@ pass rounds
 	vstmia		$fp, {@XMM[10]}			@ save next counter
 #ifdef	__APPLE__
-	mov		$const, #.LREVM0SR-.LSR
+	mov		$const, #:lower16:(.LREVM0SR-.LSR)
 	sub		$const, $ctr, $const
 #else
 	sub		$const, $ctr, #.LREVM0SR-.LSR	@ pass constants