[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_2-stable has been updated
       via  c575ceffdbc38a32f1229cf30d901403c9361334 (commit)
      from  b393a4ad38093f54a0e7251ac8694e320a150e12 (commit)


- Log -----------------------------------------------------------------
commit c575ceffdbc38a32f1229cf30d901403c9361334
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Feb 19 13:40:58 2016 +0100

    Makefile.shared: limit .dll image base pinning to FIPS builds.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Makefile.shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.shared b/Makefile.shared
index e753f44..5fe14e6 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -289,7 +289,7 @@ link_a.cygwin:
 		SHLIB_SOVER=32; \
 		extras="$(LIBNAME).def"; \
 		$(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
-		base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+		base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && base=-Wl,--image-base,0x63000000; \
 	fi; \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
 	$(PERL) util/mkrc.pl $$dll_name | \