This commit is contained in:
Tomas Weinfurt 2023-02-03 16:21:43 -08:00 коммит произвёл GitHub
Родитель 662ef33b8c
Коммит 289323d8b3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 27 добавлений и 1 удалений

Просмотреть файл

@ -90,6 +90,28 @@ if ("" -eq $Tls) {
$Tls = "schannel" $Tls = "schannel"
} else { } else {
$Tls = "openssl" $Tls = "openssl"
try {
# If no Tls was specified, try to guess it based on default OpenSSL version
# This is more complicated in attempt to silently deal with missing openssl executable
#
$pinfo = New-Object System.Diagnostics.ProcessStartInfo
$pinfo.FileName = "openssl"
$pinfo.Arguments = "version"
$pinfo.RedirectStandardError = $true
$pinfo.RedirectStandardOutput = $true
$pinfo.UseShellExecute = $false
$p = New-Object System.Diagnostics.Process
$p.StartInfo = $pinfo
$p.Start() | Out-Null
$p.WaitForExit()
$version = $p.StandardOutput.ReadToEnd()
if ($version -like "OpenSSL 3*")
{
$Tls = "openssl3"
}
} catch { }
} }
} }

Просмотреть файл

@ -339,7 +339,11 @@ else()
if (QUIC_USE_SYSTEM_LIBCRYPTO) if (QUIC_USE_SYSTEM_LIBCRYPTO)
include(FindOpenSSL) include(FindOpenSSL)
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
if (OPENSSL_VERSION VERSION_EQUAL EXPECTED_OPENSSL_VERSION OR OPENSSL_VERSION VERSION_GREATER EXPECTED_OPENSSL_VERSION) # Get Major.Minor so 3.0 can match 3.0.2.
# We cannot use VERSION_GREATER as 3.0 would work for 1.1.1 but they are not compatible.
string(FIND ${OPENSSL_VERSION} "." VERSIONLEN REVERSE)
string(SUBSTRING ${OPENSSL_VERSION} 0 ${VERSIONLEN} OPENSSL_MAJORMINOR)
if (OPENSSL_VERSION VERSION_EQUAL EXPECTED_OPENSSL_VERSION OR OPENSSL_MAJORMINOR VERSION_EQUAL EXPECTED_OPENSSL_VERSION)
target_link_libraries(OpenSSLQuic INTERFACE OpenSSL::Crypto) target_link_libraries(OpenSSLQuic INTERFACE OpenSSL::Crypto)
else() else()
message(FATAL_ERROR "OpenSSL ${EXPECTED_OPENSSL_VERSION} not found, found ${OPENSSL_VERSION}") message(FATAL_ERROR "OpenSSL ${EXPECTED_OPENSSL_VERSION} not found, found ${OPENSSL_VERSION}")