[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b95de5ecdea29f0ac658b6ea86d0cd2d77efcb13 (commit)
      from  3dca57f8cadbca2eb6dec93bf12f486acfd274a3 (commit)


- Log -----------------------------------------------------------------
commit b95de5ecdea29f0ac658b6ea86d0cd2d77efcb13
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Apr 21 16:57:29 2015 -0400

    Avoid "no config file" warning message
    
    Set config to /dev/null when doing make rehash.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Makefile.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index de08a47..301b4d3 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -438,8 +438,8 @@ rehash.time: certs apps
 	@if [ -z "$(CROSS_COMPILE)" ]; then \
 		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
 		[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
-		OPENSSL_DEBUG_MEMORY=on; \
-		export OPENSSL OPENSSL_DEBUG_MEMORY; \
+		OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONFIG=/dev/null ; \
+		export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONFIG; \
 		$(PERL) tools/c_rehash certs/demo) && \
 		touch rehash.time; \
 	else :; fi