[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  c47a56d615a7baf974de85e7f609cacbf5297dd5 (commit)
      from  fefe3169bb12865732a3395ce43995fc661ff10b (commit)


- Log -----------------------------------------------------------------
commit c47a56d615a7baf974de85e7f609cacbf5297dd5
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Thu Oct 31 21:41:30 2019 +0100

    s390x: fix build errors
    
    ecp_s390x_nistp.c and ecx_meth.c need to include s390x_arch.h.
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10317)

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

Summary of changes:
 crypto/ec/build.info | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/ec/build.info b/crypto/ec/build.info
index 90aea66a14..ba16e088fa 100644
--- a/crypto/ec/build.info
+++ b/crypto/ec/build.info
@@ -73,6 +73,9 @@ GENERATE[ecp_nistz256-avx2.s]=asm/ecp_nistz256-avx2.pl
 GENERATE[ecp_nistz256-sparcv9.S]=asm/ecp_nistz256-sparcv9.pl
 INCLUDE[ecp_nistz256-sparcv9.o]=..
 
+INCLUDE[ecp_s390x_nistp.o]=..
+INCLUDE[ecx_meth.o]=..
+
 GENERATE[ecp_nistz256-armv4.S]=asm/ecp_nistz256-armv4.pl
 INCLUDE[ecp_nistz256-armv4.o]=..
 GENERATE[ecp_nistz256-armv8.S]=asm/ecp_nistz256-armv8.pl