[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  fc97c882f443060dffd8eb56a6b8784e52096c86 (commit)
      from  990fe909949a58398b3a0cbbdc52b9bbb9cefaa0 (commit)


- Log -----------------------------------------------------------------
commit fc97c882f443060dffd8eb56a6b8784e52096c86
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Sep 17 12:36:37 2018 +0200

    sha/asm/keccak1600-s390x.pl: resolve -march=z900 portability issue.
    
    Negative displacement in memory references was not originally specified,
    so that for maximum coverage one should abstain from it, just like with
    any other extension. [Unless it's guarded by run-time switch, but there
    is no switch in keccak1600-s390x.]
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7239)

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

Summary of changes:
 crypto/sha/asm/keccak1600-s390x.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/sha/asm/keccak1600-s390x.pl b/crypto/sha/asm/keccak1600-s390x.pl
index 3bce19b..1184cf2 100755
--- a/crypto/sha/asm/keccak1600-s390x.pl
+++ b/crypto/sha/asm/keccak1600-s390x.pl
@@ -432,9 +432,9 @@ SHA3_absorb:
 	lrvg	%r0,0($inp)
 	la	$inp,8($inp)
 	xg	%r0,0(%r1)
-	la	%r1,8(%r1)
 	a${g}hi	$len,-8
-	stg	%r0,-8(%r1)
+	stg	%r0,0(%r1)
+	la	%r1,8(%r1)
 	brct	$bsz,.Lblock_absorb
 
 	stm${g}	$inp,$len,$frame+3*$SIZE_T($sp)