diff options
author | Harry Mallon <hjmallon@gmail.com> | 2020-04-07 17:03:07 (GMT) |
---|---|---|
committer | Harry Mallon <hjmallon@gmail.com> | 2020-04-08 14:15:49 (GMT) |
commit | bf94dcba7606a7ac0c44d9071636bdfb50c2cabf (patch) | |
tree | ad8a3fd470474cc873e8dfd7332ca95f1a22c838 /Help | |
parent | 37fa5122c2c1e2138b9e01191dc3cc1800f6ba40 (diff) | |
download | CMake-bf94dcba7606a7ac0c44d9071636bdfb50c2cabf.zip CMake-bf94dcba7606a7ac0c44d9071636bdfb50c2cabf.tar.gz CMake-bf94dcba7606a7ac0c44d9071636bdfb50c2cabf.tar.bz2 |
file(UPLOAD): Add support for TLS_VERIFY and TLS_CAINFO
* Improve and test err messages when TLS_VERIFY and TLS_CAINFO
are not set in file(DOWNLOAD) and file(UPLOAD).
Diffstat (limited to 'Help')
-rw-r--r-- | Help/command/file.rst | 25 | ||||
-rw-r--r-- | Help/release/dev/file-upload-tls.rst | 5 |
2 files changed, 17 insertions, 13 deletions
diff --git a/Help/command/file.rst b/Help/command/file.rst index 6105219..bb560a9 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -836,6 +836,18 @@ Options to both ``DOWNLOAD`` and ``UPLOAD`` are: If neither ``NETRC`` option is given CMake will check variables ``CMAKE_NETRC`` and ``CMAKE_NETRC_FILE``, respectively. +``TLS_VERIFY <ON|OFF>`` + Specify whether to verify the server certificate for ``https://`` URLs. + The default is to *not* verify. + +``TLS_CAINFO <file>`` + Specify a custom Certificate Authority file for ``https://`` URLs. + +For ``https://`` URLs CMake must be built with OpenSSL support. ``TLS/SSL`` +certificates are not checked by default. Set ``TLS_VERIFY`` to ``ON`` to +check certificates. If neither ``TLS`` option is given CMake will check +variables ``CMAKE_TLS_VERIFY`` and ``CMAKE_TLS_CAINFO``, respectively. + Additional options to ``DOWNLOAD`` are: ``EXPECTED_HASH ALGO=<value>`` @@ -847,19 +859,6 @@ Additional options to ``DOWNLOAD`` are: ``EXPECTED_MD5 <value>`` Historical short-hand for ``EXPECTED_HASH MD5=<value>``. -``TLS_VERIFY <ON|OFF>`` - Specify whether to verify the server certificate for ``https://`` URLs. - The default is to *not* verify. - -``TLS_CAINFO <file>`` - Specify a custom Certificate Authority file for ``https://`` URLs. - -For ``https://`` URLs CMake must be built with OpenSSL support. ``TLS/SSL`` -certificates are not checked by default. Set ``TLS_VERIFY`` to ``ON`` to -check certificates and/or use ``EXPECTED_HASH`` to verify downloaded content. -If neither ``TLS`` option is given CMake will check variables -``CMAKE_TLS_VERIFY`` and ``CMAKE_TLS_CAINFO``, respectively. - Locking ^^^^^^^ diff --git a/Help/release/dev/file-upload-tls.rst b/Help/release/dev/file-upload-tls.rst new file mode 100644 index 0000000..e19be24 --- /dev/null +++ b/Help/release/dev/file-upload-tls.rst @@ -0,0 +1,5 @@ +file-upload-tls +--------------- + +* The :command:`file(UPLOAD)` command gained ``TLS_VERIFY`` and ``TLS_CAINFO`` + options to control server certificate verification. |