summaryrefslogtreecommitdiff
path: root/libavformat/tls_openssl.c
Commit message (Collapse)AuthorAge
* lavc, lavf: move avformat static mutex from avcodec to avformatwm42017-12-26
| | | | | | | | It's completely absurd that libavcodec would care about libavformat locking, but it was there because the lock manager was in libavcodec. This is more stright forward. Changes ABI, but we don't require ABI compatibility currently.
* Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'James Almer2017-11-02
|\ | | | | | | | | | | | | * commit '0671eb2346c17e8fb13784cf90ce416661fdea1c': tls_openssl: Readd support for nonblocking operation Merged-by: James Almer <jamrial@gmail.com>
| * tls_openssl: Readd support for nonblocking operationMartin Storsjö2017-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rtmp protocol uses nonblocking reads, to poll for incoming messages from the server while publishing a stream. Prior to 94599a6de3822b13c94096d764868128f388ba28 and d13b124eaf452b267480074b2e6946538ed03a6e, the tls protocol handled the nonblocking flag, mostly as a side effect from not using custom IO callbacks for reading from the socket. When custom IO callbacks were taken into use in d15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02, the handling of a nonblocking socket wasn't necessary for the default blocking mode any longer. The code was simplified, since it was overlooked that other code within libavformat actually used the tls protocol in nonblocking mode. This fixes publishing over rtmps, with the openssl backend. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/tls_openssl: move some functions up in the fileJames Almer2017-11-02
| | | | | | | | Cosmetic change, reduces differences with libav.
* | Merge commit '61cec5adaacb358783c18aa07362f15824c1b274'James Almer2017-11-01
|\| | | | | | | | | | | | | | | | | | | * commit '61cec5adaacb358783c18aa07362f15824c1b274': tls: Hide backend implementation details from users Also includes ed434be106a4615e0419b3ac7664220741afda2d Changes were made to support schannel and securetransport. Merged-by: James Almer <jamrial@gmail.com>
| * tls: Hide backend implementation details from usersDiego Biurrun2017-06-02
| | | | | | | | | | | | | | | | TLS is currently implemented over either OpenSSL or GnuTLS, with more backends likely to appear in the future. Currently, those backend libraries are part of the protocol names used during e.g. the configure stage of a build. Hide those details behind a generically-named declaration for the TLS protocol to avoid leaking those details into the configuration stage.
| * openssl: Allow newer TLS versions than TLSv1Mark Thompson2016-10-31
| | | | | | | | | | | | 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.
| * openssl: Avoid double semicolons after the GET_BIO_DATA macroMartin Storsjö2016-10-25
| | | | | | | | | | | | | | | | | | | | | | When the macro is expanded with a semicolon following it and the macro itself contains a semicolon, we ended up in double semicolons, which is treated as a statement that disallows further declarations. This avoids errors about mixed declarations and statements on gcc, after ee050797664c. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-23
| | | | | | | | | | | | | | 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-17
| | | | | | | | | | | | 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-30
| | | | | | | | | | | | | | | | 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-21
| | | | | | | | | | | | Fixes #5675 Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* | Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis2016-02-29
|\| | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | There is no need to have this mess in network.c. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: split tls.cwm42015-05-26
| | | | | | | | 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-27
| | | | | | There is no need to have this mess in network.c. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: split tls.cwm42015-05-27
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>