generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'

Browse Source 
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
  tls: Add support for listen mode

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: 4f4eb380f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-27 11:21:42 +02:00
parent 689a1bd917 705b748e8d
commit f31c36e552
3 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
doc/protocols.texi
View File

@@ -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_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 cert=@var{filename}
Certificate file. The file must be in OpenSSL PEM format.
@item key_file, key=@var{filename}
A file containing the private key for the certificate.
@item key=@var{filename}
Private key file.
@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