[openssl] master update

Richard Levitte levitte at openssl.org
Sun Jul 21 09:08:20 UTC 2019


The branch master has been updated
       via  38f6f99cdf0a87345d646d30a764c089c38627ad (commit)
      from  5800ba761052894145abe7a74a1159df007b6875 (commit)


- Log -----------------------------------------------------------------
commit 38f6f99cdf0a87345d646d30a764c089c38627ad
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jul 17 21:22:42 2019 +0200

    Cygwin: enable the use of Dl_info and dladdr()
    
    These weren't available in Cygwin at the time our DSO code was
    written, but things have changed since.
    
    Fixes #9385
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9402)

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

Summary of changes:
 crypto/dso/dso_dlfcn.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index 5e98513..d076c7e 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -27,8 +27,7 @@
 #  endif
 #  include <dlfcn.h>
 #  define HAVE_DLINFO 1
-#  if defined(__CYGWIN__) || \
-     defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
+#  if defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
      (defined(__osf__) && !defined(RTLD_NEXT))     || \
      (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \
         defined(__ANDROID__)


More information about the openssl-commits mailing list