[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  dca5c70121e75774feb7d5e2ac6e453e8675645b (commit)
      from  b32b896166199b497bf98da6a5c5b50d8811851f (commit)


- Log -----------------------------------------------------------------
commit dca5c70121e75774feb7d5e2ac6e453e8675645b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 8 22:22:53 2016 +0100

    Add extra include directory for includers of ppc_arch.h
    
    crypto/evp/e_aes.c and crypto/modes/gcm128.c include ppc_arch.h, which
    is located in crypto/, so add that as extra include directory for them.
    
    Issue reported by Jeffrey Walton <noloader at gmail.com>
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 crypto/evp/build.info   | 2 +-
 crypto/modes/build.info | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/evp/build.info b/crypto/evp/build.info
index 3116afa..61331dbf 100644
--- a/crypto/evp/build.info
+++ b/crypto/evp/build.info
@@ -14,7 +14,7 @@ SOURCE[../../libcrypto]=\
         e_aes_cbc_hmac_sha1.c e_aes_cbc_hmac_sha256.c e_rc4_hmac_md5.c \
         e_chacha20_poly1305.c cmeth_lib.c
 
-INCLUDE[e_aes.o]=../modes
+INCLUDE[e_aes.o]=.. ../modes
 INCLUDE[e_aes_cbc_hmac_sha1.o]=../modes
 INCLUDE[e_aes_cbc_hmac_sha256.o]=../modes
 INCLUDE[e_camellia.o]=../modes
diff --git a/crypto/modes/build.info b/crypto/modes/build.info
index b59780f..d1b7d2b 100644
--- a/crypto/modes/build.info
+++ b/crypto/modes/build.info
@@ -4,6 +4,8 @@ SOURCE[../../libcrypto]=\
         ccm128.c xts128.c wrap128.c ocb128.c \
         {- $target{modes_asm_src} -}
 
+INCLUDE[gcm128.o]=..
+
 GENERATE[ghash-ia64.s]=asm/ghash-ia64.pl $(CFLAGS)
 GENERATE[ghash-x86.s]=asm/ghash-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
 GENERATE[ghash-x86_64.s]=asm/ghash-x86_64.pl $(PERLASM_SCHEME)