diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 11:21:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 11:33:19 +0200 |
| commit | f31c36e552663b11c49431745b8e75a0d3000539 (patch) | |
| tree | 9072c709ffe783a8835dca5b450ea04e77a4cad2 /doc/protocols.texi | |
| parent | 689a1bd917d528c9a84cc1a998159eb31e98ea79 (diff) | |
| parent | 705b748e8d8612385c96428ae36ed0d42a170d93 (diff) | |
| download | ffmpeg-f31c36e552663b11c49431745b8e75a0d3000539.tar.gz | |
Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
tls: Add support for listen mode
Conflicts:
doc/protocols.texi
libavformat/tls.c
libavformat/version.h
See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
| -rw-r--r-- | doc/protocols.texi | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index e53d6a47a5..5022cbeb4e 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -883,14 +883,18 @@ the host name is validated as well.) This is disabled by default since it requires a CA database to be provided by the caller in many cases. -@item listen -Act as a server, listening for an incoming connection. - -@item cert=@var{filename} -Certificate file. The file must be in OpenSSL PEM format. - -@item key=@var{filename} -Private key file. +@item cert_file, cert=@var{filename} +A file containing a certificate to use in the handshake with the peer. +(When operating as server, in listen mode, this is more often required +by the peer, while client certificates only are mandated in certain +setups.) + +@item key_file, key=@var{filename} +A file containing the private key for the certificate. + +@item listen=@var{1|0} +If enabled, listen for connections on the provided port, and assume +the server role in the handshake instead of the client role. @end table |