[openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  de4fb434c7f5fe7359dd9f57185bb98845d8e6f1 (commit)
      from  0342e42d864b7a670b4403389df057c4da6d7975 (commit)


- Log -----------------------------------------------------------------
commit de4fb434c7f5fe7359dd9f57185bb98845d8e6f1
Author: Shigeki Ohtsu <ohtsu at ohtsu.org>
Date:   Wed Mar 7 23:52:52 2018 +0900

    deps: add s390 asm rules for OpenSSL-1.1.1
    
    Generate asm files with Makefile rules.
    
    From:
    - https://github.com/nodejs/node/commit/0d9a86c7cb3566b22becc656691282402f5026c0
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8351)

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

Summary of changes:
 crypto/chacha/build.info   | 2 ++
 crypto/poly1305/build.info | 1 +
 crypto/rc4/build.info      | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index 02f8e51..e75ca72 100644
--- a/crypto/chacha/build.info
+++ b/crypto/chacha/build.info
@@ -9,6 +9,8 @@ GENERATE[chacha-armv4.S]=asm/chacha-armv4.pl $(PERLASM_SCHEME)
 INCLUDE[chacha-armv4.o]=..
 GENERATE[chacha-armv8.S]=asm/chacha-armv8.pl $(PERLASM_SCHEME)
 INCLUDE[chacha-armv8.o]=..
+GENERATE[chacha-s390x.S]=asm/chacha-s390x.pl $(PERLASM_SCHEME)
+INCLUDE[chacha-s390x.o]=..
 
 BEGINRAW[Makefile(unix)]
 ##### CHACHA assembler implementations
diff --git a/crypto/poly1305/build.info b/crypto/poly1305/build.info
index 631b32b..4e4dcca 100644
--- a/crypto/poly1305/build.info
+++ b/crypto/poly1305/build.info
@@ -17,6 +17,7 @@ GENERATE[poly1305-armv8.S]=asm/poly1305-armv8.pl $(PERLASM_SCHEME)
 INCLUDE[poly1305-armv8.o]=..
 GENERATE[poly1305-mips.S]=asm/poly1305-mips.pl $(PERLASM_SCHEME)
 INCLUDE[poly1305-mips.o]=..
+GENERATE[poly1305-s390x.S]=asm/poly1305-s390x.pl $(PERLASM_SCHEME)
 
 BEGINRAW[Makefile(unix)]
 {- $builddir -}/poly1305-%.S:	{- $sourcedir -}/asm/poly1305-%.pl
diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info
index 46ee66b..913942b 100644
--- a/crypto/rc4/build.info
+++ b/crypto/rc4/build.info
@@ -11,6 +11,8 @@ GENERATE[rc4-md5-x86_64.s]=asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME)
 
 GENERATE[rc4-parisc.s]=asm/rc4-parisc.pl $(PERLASM_SCHEME)
 
+GENERATE[rc4-s390x.s]=asm/rc4-s390x.pl $(PERLASM_SCHEME)
+
 BEGINRAW[Makefile]
 # GNU make "catch all"
 {- $builddir -}/rc4-%.s:	{- $sourcedir -}/asm/rc4-%.pl