Changeset 5566

Timestamp:

Mar 9, 2017 4:41:45 AM (8 years ago)

Author:

riza

Message:

Re #1994 (misc): Fix linker error on Visual Studio when using OpenSSL 1.1 or newer.
Thanks to Sean Bright for the report and patch.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -124 +124 @@
 
 #ifdef _MSC_VER
-#  pragma comment( lib, "libeay32")
-#  pragma comment( lib, "ssleay32")
-#  pragma comment( lib, "crypt32")
+#  if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#    pragma comment(lib, "libcrypto")
+#    pragma comment(lib, "libssl")
+#  else
+#    pragma comment(lib, "libeay32")
+#    pragma comment(lib, "ssleay32")
+#  endif
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -33 +33 @@
 #if defined(PJ_HAS_SSL_SOCK) && (PJ_HAS_SSL_SOCK != 0)
 #  include <openssl/rand.h>
+#  include <openssl/opensslv.h>
 
 /* Suppress compile warning of OpenSSL deprecation (OpenSSL is deprecated
@@ -1152 +1153 @@
 /* Include OpenSSL libraries for MSVC */
 #  ifdef _MSC_VER
-#    pragma comment( lib, "libeay32")
-#    pragma comment( lib, "ssleay32")
+#    if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#      pragma comment(lib, "libcrypto")
+#    else
+#      pragma comment(lib, "libeay32")
+#      pragma comment(lib, "ssleay32")
+#    endif
 #  endif