diff options
| author | Lars Ingebrigtsen | 2019-08-23 11:51:54 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-08-23 11:51:54 +0200 |
| commit | b4065de33cf397b80e15c22740d34b4a03cfdc17 (patch) | |
| tree | b750c1b21263cb119f4467c109cb9ac421de968d /doc | |
| parent | 7b0d49854675eae962c6baf8ae6fd90a2c87889b (diff) | |
| download | emacs-b4065de33cf397b80e15c22740d34b4a03cfdc17.tar.gz emacs-b4065de33cf397b80e15c22740d34b4a03cfdc17.zip | |
Rename renamed nsm.el variables and functions back
* doc/emacs/misc.texi (Network Security): Start working on
updating the NSM bits, but it's unclear how much of the new stuff
to document.
* lisp/net/nsm.el: Rename all nsm-tls-check-* functions to
nsm-protocol-check--* to bring them back into line with the
documentation.
(network-security-protocol-checks): Renamed back again from
`nsm-tls-checks', as this variable is documented and can't just go
away.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/misc.texi | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 5877c4b0de1..83fb8acf7c2 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi | |||
| @@ -302,7 +302,10 @@ the Transport Layer Security (@acronym{TLS}) features. | |||
| 302 | @vindex network-security-level | 302 | @vindex network-security-level |
| 303 | The @code{network-security-level} variable determines the security | 303 | The @code{network-security-level} variable determines the security |
| 304 | level that @acronym{NSM} enforces. If its value is @code{low}, no | 304 | level that @acronym{NSM} enforces. If its value is @code{low}, no |
| 305 | security checks are performed. | 305 | security checks are performed. This is not recommended, and will |
| 306 | basically mean that your network connections can't be trusted. | ||
| 307 | However, the setting can be useful in limited circumstances, as when | ||
| 308 | testing network issues. | ||
| 306 | 309 | ||
| 307 | If this variable is @code{medium} (which is the default), a number of | 310 | If this variable is @code{medium} (which is the default), a number of |
| 308 | checks will be performed. If as result @acronym{NSM} determines that | 311 | checks will be performed. If as result @acronym{NSM} determines that |
| @@ -325,13 +328,12 @@ The protocol network checks is controlled via the | |||
| 325 | @code{network-security-protocol-checks} variable. | 328 | @code{network-security-protocol-checks} variable. |
| 326 | 329 | ||
| 327 | It's an alist where the first element of each association is the name | 330 | It's an alist where the first element of each association is the name |
| 328 | of the check, the second element is the security level where the check | 331 | of the check, and the second element is the security level where the |
| 329 | should be used, and the optional third element is a parameter supplied | 332 | check should be used. |
| 330 | to the check. | ||
| 331 | 333 | ||
| 332 | An element like @code{(rc4 medium)} will result in the function | 334 | An element like @code{(rc4 medium)} will result in the function |
| 333 | @code{nsm-protocol-check--rc4} being called like thus: | 335 | @code{nsm-protocol-check--rc4} being called like thus: |
| 334 | @w{@code{(nsm-protocol-check--rc4 host port status optional-parameter)}}. | 336 | @w{@code{(nsm-protocol-check--rc4 host port status settings)}}. |
| 335 | The function should return non-@code{nil} if the connection should | 337 | The function should return non-@code{nil} if the connection should |
| 336 | proceed and @code{nil} otherwise. | 338 | proceed and @code{nil} otherwise. |
| 337 | 339 | ||