aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRobert Pluim2019-11-18 10:48:29 +0100
committerRobert Pluim2019-11-23 18:51:08 +0100
commit8934762bb37273e6606097de92dcc2556456acd2 (patch)
treef221324e9e52e5cffe43929f3beb244579aa5288 /doc
parenta27c8929f2ab26dc0d27c8969857d3bc108747f5 (diff)
downloademacs-8934762bb37273e6606097de92dcc2556456acd2.tar.gz
emacs-8934762bb37273e6606097de92dcc2556456acd2.zip
Default network-stream-use-client-certificates to nil
* lisp/net/network-stream.el (network-stream-use-client-certificates): Default to nil. (open-network-stream): Adapt description to new default of network-stream-use-client-certificates. * etc/NEWS: network-stream-use-client-certificates defaults to nil now. * doc/lispref/processes.texi (Network): Flip network-stream-use-client-certificates description. * doc/misc/auth.texi (Help for users): Mention network-stream-use-client-certificates.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/processes.texi10
-rw-r--r--doc/misc/auth.texi7
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 5caf0a24265..fc5832253f9 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2521,11 +2521,11 @@ expect the network traffic to be encrypted.
2521Either a list of the form @code{(@var{key-file} @var{cert-file})}, 2521Either a list of the form @code{(@var{key-file} @var{cert-file})},
2522naming the certificate key file and certificate file itself, or 2522naming the certificate key file and certificate file itself, or
2523@code{t}, meaning to query @code{auth-source} for this information 2523@code{t}, meaning to query @code{auth-source} for this information
2524(@pxref{Help for users,,auth-source, auth, Emacs auth-source Library}). 2524(@pxref{Help for users,,auth-source, auth, Emacs auth-source
2525Only used for @acronym{TLS} or @acronym{STARTTLS}. If 2525Library}). Only used for @acronym{TLS} or @acronym{STARTTLS}. To
2526@code{:client-certificate} is not specified, behave as if it were t, 2526enable automatic queries of @code{auth-source} when
2527customize @code{network-stream-use-client-certificates} to change 2527@code{:client-certificate} is not specified customize
2528this. 2528@code{network-stream-use-client-certificates} to t.
2529 2529
2530@item :return-list @var{cons-or-nil} 2530@item :return-list @var{cons-or-nil}
2531The return value of this function. If omitted or @code{nil}, return a 2531The return value of this function. If omitted or @code{nil}, return a
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 93a301dcb1a..415a64f0211 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -92,6 +92,7 @@ backends and you can write your own if you want.
92@chapter Help for users 92@chapter Help for users
93 93
94``Netrc'' files are a de facto standard. They look like this: 94``Netrc'' files are a de facto standard. They look like this:
95
95@example 96@example
96machine @var{mymachine} login @var{myloginname} password @var{mypassword} port @var{myport} 97machine @var{mymachine} login @var{myloginname} password @var{mypassword} port @var{myport}
97@end example 98@end example
@@ -108,12 +109,16 @@ The @code{user} is the user name. It's known as @var{:user} in
108 109
109You can also use this file to specify client certificates to use when 110You can also use this file to specify client certificates to use when
110setting up TLS connections. The format is: 111setting up TLS connections. The format is:
112
111@example 113@example
112machine @var{mymachine} port @var{myport} key @var{key} cert @var{cert} 114machine @var{mymachine} port @var{myport} key @var{key} cert @var{cert}
113@end example 115@end example
114 116
115@var{key} and @var{cert} are filenames containing the key and 117@var{key} and @var{cert} are filenames containing the key and
116certificate to use respectively. 118certificate to use respectively. In order to make network connections
119use them automatically, either pass @code{:client-certificate t} to
120@code{open-network-stream}, or customize
121@code{network-stream-use-client-certificates} to @code{t}.
117 122
118You can use spaces inside a password or other token by surrounding the 123You can use spaces inside a password or other token by surrounding the
119token with either single or double quotes. 124token with either single or double quotes.