[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b2b580fe445e064da50c13d3e00f71022da16ece (commit)
      from  d64b62998beceef8a8b8e1558862eb1c671d677a (commit)


- Log -----------------------------------------------------------------
commit b2b580fe445e064da50c13d3e00f71022da16ece
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Fri Feb 15 22:59:09 2019 +0100

    s390x assembly pack: fix formal interface bug in chacha module
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8257)

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

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

diff --git a/crypto/chacha/asm/chacha-s390x.pl b/crypto/chacha/asm/chacha-s390x.pl
index 005c810..abf7283 100755
--- a/crypto/chacha/asm/chacha-s390x.pl
+++ b/crypto/chacha/asm/chacha-s390x.pl
@@ -225,7 +225,7 @@ LABEL	("ChaCha20_ctr32");
 	larl	("%r1","OPENSSL_s390xcap_P");
 
 	lghi	("%r0",64);
-&{$z?	\&cgr:\&cr}	($len,"%r0");
+&{$z?	\&clgr:\&clr}	($len,"%r0");
 	jle	("_s390x_chacha_novx");
 
 	lg	("%r0","S390X_STFLE+16(%r1)");