[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b830e0042972a237c6677c071f1fcde5c1afbea7 (commit)
      from  bb30bce22b1f1e0dd6e3e33f28ddb24dc5b285ab (commit)


- Log -----------------------------------------------------------------
commit b830e0042972a237c6677c071f1fcde5c1afbea7
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 8 13:07:46 2020 +0200

    Diverse build.info: Adjust paths
    
    Fixes #12815
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/12816)

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

Summary of changes:
 crypto/bn/build.info       | 2 --
 crypto/poly1305/build.info | 2 +-
 crypto/ripemd/build.info   | 2 +-
 test/build.info            | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index a40bcdca0f..093cbcc7f1 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -126,8 +126,6 @@ DEFINE[../../providers/libfips.a]=$BNDEF
 DEFINE[../../providers/liblegacy.a]=$BNDEF
 DEFINE[../../providers/libimplementations.a]=$BNDEF
 
-INCLUDE[../../libcrypto]=../../crypto/include
-
 INCLUDE[bn_exp.o]=..
 
 GENERATE[bn-586.s]=asm/bn-586.pl
diff --git a/crypto/poly1305/build.info b/crypto/poly1305/build.info
index b3078f21cc..9e4085f9fa 100644
--- a/crypto/poly1305/build.info
+++ b/crypto/poly1305/build.info
@@ -34,7 +34,7 @@ SOURCE[../../libcrypto]=poly1305.c $POLY1305ASM
 # Implementations are now spread across several libraries, so the defines
 # need to be applied to all affected libraries and modules.
 DEFINE[../../libcrypto]=$POLY1305DEF
-DEFINE[../providers/libimplementations.a]=$POLY1305DEF
+DEFINE[../../providers/libimplementations.a]=$POLY1305DEF
 
 GENERATE[poly1305-sparcv9.S]=asm/poly1305-sparcv9.pl
 INCLUDE[poly1305-sparcv9.o]=..
diff --git a/crypto/ripemd/build.info b/crypto/ripemd/build.info
index 4cc5b3a2eb..762067e635 100644
--- a/crypto/ripemd/build.info
+++ b/crypto/ripemd/build.info
@@ -14,7 +14,7 @@ ENDIF
 
 # Implementations are now spread across several libraries, so the defines
 # need to be applied to all affected libraries and modules
-DEFINE[../providers/libimplementations.a]=$RMD160DEF
+DEFINE[../../providers/libimplementations.a]=$RMD160DEF
 
 SOURCE[../../libcrypto]=rmd_dgst.c rmd_one.c $RMD160ASM
 DEFINE[../../libcrypto]=$RMD160DEF
diff --git a/test/build.info b/test/build.info
index 16ff48e24b..7c80b16284 100644
--- a/test/build.info
+++ b/test/build.info
@@ -685,7 +685,7 @@ IF[{- !$disabled{tests} -}]
     DEPEND[keymgmt_internal_test]=../libcrypto.a libtestutil.a
 
     SOURCE[ffc_internal_test]=ffc_internal_test.c
-    INCLUDE[ffc_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[ffc_internal_test]=.. ../include ../apps/include
     DEPEND[ffc_internal_test]=../libcrypto.a libtestutil.a
 
     IF[{- !$disabled{mdc2} -}]