prefer OpenSSL 1.1 with 7.2 as that's what is default

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index d0c71fb933e5e3a39bfeb8ae59772d525bd93a78..7b3cbb522c7e1901c88f77c2572d089b02eef3a0 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -3356,18 +3356,18 @@ function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part
        var ret = 0;
        var cflags_var = "CFLAGS_" + target.toUpperCase();
 
-       if (CHECK_LIB("ssleay32.lib", target, path_to_check, common_name) &&
-                       CHECK_LIB("libeay32.lib", target, path_to_check, common_name) &&
-                       CHECK_LIB("crypt32.lib", target, path_to_check, common_name) &&
-                       CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) {
-               /* Openssl 1.0.x and lower */
-               return 1;
-       } else if (CHECK_LIB("libcrypto.lib", target, path_to_check) &&
+       if (CHECK_LIB("libcrypto.lib", target, path_to_check) &&
                        CHECK_LIB("libssl.lib", target, path_to_check) &&
                        CHECK_LIB("crypt32.lib", target, path_to_check, common_name) &&
                        CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) {
                /* Openssl 1.1.x */
                return 2;
+       } else if (CHECK_LIB("ssleay32.lib", target, path_to_check, common_name) &&
+                       CHECK_LIB("libeay32.lib", target, path_to_check, common_name) &&
+                       CHECK_LIB("crypt32.lib", target, path_to_check, common_name) &&
+                       CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) {
+               /* Openssl 1.0.x and lower */
+               return 1;
        }
 
        return ret;