зеркало из https://github.com/microsoft/msquic.git
Update to the Latest OpenSSL (#3406)
This commit is contained in:
Родитель
2466a4bf0a
Коммит
24efce18a0
|
@ -261,21 +261,21 @@ stages:
|
|||
tls: openssl
|
||||
extraPrepareArgs: -DisableTest
|
||||
extraBuildArgs: -EnableTelemetryAsserts
|
||||
- template: ./templates/build-config-user.yml
|
||||
parameters:
|
||||
image: windows-2019
|
||||
platform: uwp
|
||||
arch: arm64
|
||||
tls: openssl
|
||||
extraPrepareArgs: -DisableTest
|
||||
extraBuildArgs: -EnableTelemetryAsserts
|
||||
- template: ./templates/build-config-user.yml
|
||||
parameters:
|
||||
image: windows-2019
|
||||
platform: windows
|
||||
arch: arm64
|
||||
tls: openssl
|
||||
extraBuildArgs: -EnableTelemetryAsserts
|
||||
# - template: ./templates/build-config-user.yml
|
||||
# parameters:
|
||||
# image: windows-2019
|
||||
# platform: uwp
|
||||
# arch: arm64
|
||||
# tls: openssl
|
||||
# extraPrepareArgs: -DisableTest
|
||||
# extraBuildArgs: -EnableTelemetryAsserts
|
||||
# - template: ./templates/build-config-user.yml
|
||||
# parameters:
|
||||
# image: windows-2019
|
||||
# platform: windows
|
||||
# arch: arm64
|
||||
# tls: openssl
|
||||
# extraBuildArgs: -EnableTelemetryAsserts
|
||||
- template: ./templates/build-config-user.yml
|
||||
parameters:
|
||||
image: windows-2019
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
[submodule "submodules/openssl"]
|
||||
path = submodules/openssl
|
||||
url = https://github.com/quictls/openssl.git
|
||||
branch = OpenSSL_1_1_1s+quic1
|
||||
branch = OpenSSL_1_1_1t+quic1
|
||||
[submodule "submodules/openssl3"]
|
||||
path = submodules/openssl3
|
||||
url = https://github.com/quictls/openssl.git
|
||||
branch = openssl-3.0.7+quic1
|
||||
branch = openssl-3.0.8+quic1
|
||||
[submodule "submodules/clog"]
|
||||
path = submodules/clog
|
||||
url = https://github.com/microsoft/CLOG.git
|
||||
|
|
|
@ -87,6 +87,9 @@ $Architectures = "x64","x86","arm64"
|
|||
if ($XDP) {
|
||||
# XDP only supports x64
|
||||
$Architectures = "x64"
|
||||
} elseif ($Tls -ne "schannel") {
|
||||
# OpenSSL doesn't support arm64 currently
|
||||
$Architectures = "x64","x86"
|
||||
}
|
||||
|
||||
# Copy artifacts to correct folders
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 6d6e737a473eba179ea9b666a7bc2e3873c1c5c7
|
||||
Subproject commit c3f5f36f5dadfa334119e940b7576a4abfa428c8
|
|
@ -1 +1 @@
|
|||
Subproject commit 247bb4dbd1d327ff9ed852ca53402249db5db486
|
||||
Subproject commit 183e548d93a6aeedab0fd6cb737923a93f807b83
|
Загрузка…
Ссылка в новой задаче