diff options
| author | Brad King <brad.king@kitware.com> | 2024-09-27 12:02:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-09-27 12:03:01 (GMT) |
| commit | f7e2422c3e4361053d1ad9f1e009d3f078aa7b03 (patch) | |
| tree | 7a117808bbfcf9bc2b5cd1751e4c831c5bc635d7 /Tests/RunCMake | |
| parent | 5701ba7484a917c11e256e0a7a95ccad1ee1acbc (diff) | |
| parent | 38390245a2ceebe6ece3859e887442b8cce01297 (diff) | |
| download | CMake-f7e2422c3e4361053d1ad9f1e009d3f078aa7b03.zip CMake-f7e2422c3e4361053d1ad9f1e009d3f078aa7b03.tar.gz CMake-f7e2422c3e4361053d1ad9f1e009d3f078aa7b03.tar.bz2 | |
Merge topic 'curl-tls-version'
38390245a2 ctest: Require minimum TLS 1.2 by default
5e1a59dc2b file(DOWNLOAD/UPLOAD): Require minimum TLS 1.2 by default
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9848
Diffstat (limited to 'Tests/RunCMake')
4 files changed, 7 insertions, 8 deletions
diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-darwin.txt b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-darwin.txt index 730cf59..3632a61 100644 --- a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-darwin.txt +++ b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-darwin.txt @@ -1,4 +1,4 @@ --- def-1\.1: 0;"No error" +-- def-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") -- env-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") -- env-1\.1: 0;"No error" -- var-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-windows.txt b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-windows.txt index 730cf59..3632a61 100644 --- a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-windows.txt +++ b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout-windows.txt @@ -1,4 +1,4 @@ --- def-1\.1: 0;"No error" +-- def-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") -- env-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") -- env-1\.1: 0;"No error" -- var-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout.txt b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout.txt index 34d99d1..ce313ed 100644 --- a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout.txt +++ b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad-stdout.txt @@ -1,3 +1,4 @@ +-- def-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") -- env-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") -- var-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") -- opt-1\.2: (60;"SSL peer certificate or SSH remote key was not OK"|35;"SSL connect error") diff --git a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake index 106fe44..51cb8f2 100644 --- a/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake +++ b/Tests/RunCMake/file-DOWNLOAD/TLS_VERSION-bad.cmake @@ -19,12 +19,10 @@ else() set(TEST_TLSv1_1 0) endif() -if(TEST_TLSv1_1) - # The default is to allow 1.1. - unset(ENV{CMAKE_TLS_VERSION}) - unset(CMAKE_TLS_VERSION) - download(def-1.1) -endif() +# The default is to require 1.2. +unset(ENV{CMAKE_TLS_VERSION}) +unset(CMAKE_TLS_VERSION) +download(def-1.2) # The environment variable overrides the default. set(ENV{CMAKE_TLS_VERSION} 1.2) |