From 582f4287f8d4b22570f1716b4ce293dc85a56c37 Mon Sep 17 00:00:00 2001 From: "Adam D. Ruppe" Date: Wed, 20 Apr 2022 13:34:05 -0400 Subject: [PATCH] fixup the pr --- http2.d | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/http2.d b/http2.d index aa4c460..ef002de 100644 --- a/http2.d +++ b/http2.d @@ -3260,8 +3260,8 @@ version(use_openssl) { "libssl.43.dylib", "libssl.35.dylib", "libssl.1.1.dylib", - "/usr/local/opt/openssl/lib/libssl.1.0.0.dylib", "libssl.dylib", + "/usr/local/opt/openssl/lib/libssl.1.0.0.dylib", ]; } else { static immutable string[] ossllibs = [ @@ -3281,31 +3281,33 @@ version(use_openssl) { version(X86_64) { ossllib_handle = LoadLibraryW("libssl-1_1-x64.dll"w.ptr); oeaylib_handle = LoadLibraryW("libcrypto-1_1-x64.dll"w.ptr); - } else { - static immutable wstring[] ossllibs = [ - "libssl-1_1.dll"w, - "libssl32.dll"w, - ]; + } - foreach(lib; ossllibs) { - ossllib_handle = LoadLibraryW(lib.ptr); - if(ossllib_handle !is null) break; - } + static immutable wstring[] ossllibs = [ + "libssl-1_1.dll"w, + "libssl32.dll"w, + ]; - static immutable wstring[] eaylibs = [ - "libcrypto-1_1.dll"w, - "libeay32.dll", - ]; + if(ossllib_handle is null) + foreach(lib; ossllibs) { + ossllib_handle = LoadLibraryW(lib.ptr); + if(ossllib_handle !is null) break; + } - foreach(lib; eaylibs) { - oeaylib_handle = LoadLibraryW(lib.ptr); - if (oeaylib_handle !is null) break; - } + static immutable wstring[] eaylibs = [ + "libcrypto-1_1.dll"w, + "libeay32.dll", + ]; - if(ossllib_handle is null) { - ossllib_handle = LoadLibraryW("ssleay32.dll"w.ptr); - oeaylib_handle = ossllib_handle; - } + if(oeaylib_handle is null) + foreach(lib; eaylibs) { + oeaylib_handle = LoadLibraryW(lib.ptr); + if (oeaylib_handle !is null) break; + } + + if(ossllib_handle is null) { + ossllib_handle = LoadLibraryW("ssleay32.dll"w.ptr); + oeaylib_handle = ossllib_handle; } }