[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  0822d41b6d54132df96c02cc6f6fa9b179378351 (commit)
      from  e08b444ac097825b10d3b90dbdb0d7197567cc4d (commit)


- Log -----------------------------------------------------------------
commit 0822d41b6d54132df96c02cc6f6fa9b179378351
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Mar 25 10:58:57 2017 +0100

    aes/asm/bsaes-armv7.pl: relax stack alignment requirement.
    
    Even though Apple refers to Procedure Call Standard for ARM Architecture
    (AAPCS), they apparently adhere to custom version that doesn't follow
    stack alignment constraints in the said standard. [Why or why? If it's
    vendor lock-in thing, then it would be like worst spot ever.] And since
    bsaes-armv7 relied on standard alignment, it became problematic to
    execute the code on iOS.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/aes/asm/bsaes-armv7.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
index 3329588..ba641eb 100644
--- a/crypto/aes/asm/bsaes-armv7.pl
+++ b/crypto/aes/asm/bsaes-armv7.pl
@@ -1365,7 +1365,7 @@ bsaes_cbc_encrypt:
 	vmov	@XMM[4], at XMM[15]		@ just in case ensure that IV
 	vmov	@XMM[5], at XMM[0]			@ and input are preserved
 	bl	AES_decrypt
-	vld1.8	{@XMM[0]}, [$fp,:64]		@ load result
+	vld1.8	{@XMM[0]}, [$fp]		@ load result
 	veor	@XMM[0], @XMM[0], @XMM[4]	@ ^= IV
 	vmov	@XMM[15], @XMM[5]		@ @XMM[5] holds input
 	vst1.8	{@XMM[0]}, [$rounds]		@ write output