Browse Source

OpenSSL: Prefer 1.1

Bryan Drewery 2 năm trước cách đây
mục cha
commit
74aedeb330
2 tập tin đã thay đổi với 8 bổ sung4 xóa
  1. 4 2
      src/libcrypto.cc
  2. 4 2
      src/libssl.cc

+ 4 - 2
src/libcrypto.cc

@@ -110,14 +110,16 @@ int load_libcrypto() {
 
 
   bd::Array<bd::String> libs_list(bd::String("libcrypto.so." OPENSSL_SHLIB_VERSION_STR " "
   bd::Array<bd::String> libs_list(bd::String("libcrypto.so." OPENSSL_SHLIB_VERSION_STR " "
       "libcrypto.so "
       "libcrypto.so "
+      "libcrypto.so.111 "
       "libcrypto.so.1.1 "
       "libcrypto.so.1.1 "
+      "libcrypto.so.11 "
       "libcrypto.so.1.0.0 "
       "libcrypto.so.1.0.0 "
-      "libcrypto.so.0.9.8 "
       "libcrypto.so.10 "
       "libcrypto.so.10 "
       "libcrypto.so.9 "
       "libcrypto.so.9 "
       "libcrypto.so.8 "
       "libcrypto.so.8 "
       "libcrypto.so.7 "
       "libcrypto.so.7 "
-      "libcrypto.so.6").split(' '));
+      "libcrypto.so.6 "
+      "libcrypto.so.0.9.8").split(' '));
 
 
   for (size_t i = 0; i < libs_list.length(); ++i) {
   for (size_t i = 0; i < libs_list.length(); ++i) {
     dlerror(); // Clear Errors
     dlerror(); // Clear Errors

+ 4 - 2
src/libssl.cc

@@ -103,14 +103,16 @@ int load_libssl() {
 
 
   bd::Array<bd::String> libs_list(bd::String("libssl.so." OPENSSL_SHLIB_VERSION_STR " "
   bd::Array<bd::String> libs_list(bd::String("libssl.so." OPENSSL_SHLIB_VERSION_STR " "
       "libssl.so "
       "libssl.so "
+      "libssl.so.111 "
       "libssl.so.1.1 "
       "libssl.so.1.1 "
+      "libssl.so.11 "
       "libssl.so.1.0.0 "
       "libssl.so.1.0.0 "
-      "libssl.so.0.9.8 "
       "libssl.so.10 "
       "libssl.so.10 "
       "libssl.so.9 "
       "libssl.so.9 "
       "libssl.so.8 "
       "libssl.so.8 "
       "libssl.so.7 "
       "libssl.so.7 "
-      "libssl.so.6").split(' '));
+      "libssl.so.6 "
+      "libssl.so.0.9.8").split(' '));
 
 
   for (size_t i = 0; i < libs_list.length(); ++i) {
   for (size_t i = 0; i < libs_list.length(); ++i) {
     dlerror(); // Clear Errors
     dlerror(); // Clear Errors