[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  603358de576217812cb3d752e97c78e476cdc879 (commit)
      from  0d4d5ab81980888e06b457fb00a1b224e921976f (commit)


- Log -----------------------------------------------------------------
commit 603358de576217812cb3d752e97c78e476cdc879
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 10 21:55:12 2016 +0100

    Add include directory options for assembler files that include from crypto/
    
    A few were missed in the previous commit.
    
    Closes RT#4412
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/aes/build.info | 2 ++
 crypto/sha/build.info | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index f7ab69e..fe1dd15 100644
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -49,3 +49,5 @@ BEGINRAW[Makefile]
 	CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 
 ENDRAW[Makefile]
+INCLUDE[aes-armv4.o]=..
+INCLUDE[bsaes-armv7.o]=..
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 57e9c93..136d0ee 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -57,5 +57,7 @@ BEGINRAW[Makefile(unix)]
 ENDRAW[Makefile(unix)]
 INCLUDE[sha1-armv4-large.o]=..
 INCLUDE[sha1-armv8.o]=..
+INCLUDE[sha256-armv4.o]=..
 INCLUDE[sha256-armv8.o]=..
+INCLUDE[sha512-armv4.o]=..
 INCLUDE[sha512-armv8.o]=..