aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/tls_openssl.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'Clément Bœsch2017-03-241-10/+6
|\ | | | | | | | | | | | | | | | | | | | | | | * commit 'ee050797664c7c74cae262ffab05006b55d47a11': openssl: Support version 1.1.0. This commit is mostly a noop, see 798c6ecce50f26a53d48e2577a34fabe46b32eb9 Included the simplifications by Martin Storsjö and fixed the GET_BIO_DATA() macro to prevent a warning after the simplifications. Merged-by: Clément Bœsch <u@pkh.me>
| * openssl: Support version 1.1.0.Matt Oliver2016-10-231-2/+35
| | | | | | | | | | | | | | Further simplifications by Martin Storsjö, to minimize the diff. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/tls: add tls url_get_file_handleJay Ridgeway2016-12-171-0/+7
| | | | | | | | | | | | Support url_get_file_handle on TLS streams. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | openssl: Allow newer TLS versions than TLSv1Mark Thompson2016-10-301-1/+6
| | | | | | | | | | | | | | | | The use of TLSv1_*_method() disallows newer protocol versions; instead use SSLv23_*_method() and then explicitly disable the deprecated protocol versions which should not be supported. Fixes ticket #5915.
* | openssl: Support version 1.1.0.Matt Oliver2016-10-211-63/+100
| | | | | | | | | | | | Fixes #5675 Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* | Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis2016-02-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | This commit also disables the async fate test, because it used internal APIs in a non-kosher way, which no longer exists. * commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d': lavf: reorganize URLProtocols Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: reorganize URLProtocolsAnton Khirnov2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of a linked list constructed at av_register_all(), store them in a constant array of pointers. Since no registration is necessary now, this removes some global state from lavf. This will also allow the urlprotocol layer caller to limit the available protocols in a simple and flexible way in the following commits.
| * lavf: move TLS-related ifdeffery to library specific fileswm42015-05-261-2/+66
| | | | | | | | | | | | There is no need to have this mess in network.c. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: split tls.cwm42015-05-261-0/+233
| | | | | | | | Move the OpenSSL and GnuTLS implementations to their own files. Other than the connection code (including options) and some boilerplate, no code is actually shared. Signed-off-by: Martin Storsjö <martin@martin.st>
* lavf: move TLS-related ifdeffery to library specific fileswm42015-05-271-2/+73
| | | | | | There is no need to have this mess in network.c. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: split tls.cwm42015-05-271-0/+236
Move the OpenSSL and GnuTLS implementations to their own files. Other than the connection code (including options) and some boilerplate, no code is actually shared. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>