summaryrefslogtreecommitdiff
path: root/libavformat/srtp.c
Commit message (Collapse)AuthorAge
* Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'Derek Buitenhuis2016-05-11
|\ | | | | | | | | | | | | | | * commit 'd12b5b2f135aade4099f4b26b0fe678656158c13': build: Split test programs off into separate files Some conversions done by: James Almer <jamrial@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Split test programs off into separate filesDiego Biurrun2016-04-07
| | | | | | | | | | This avoids spurious library rebuilds when only the test program code is changed and simplifies the build system.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-09
|\| | | | | | | | | | | | | | | | | | | * qatar/master: srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH rtpdec: Increase max rtp packet size to 8192 lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500 h264pred: Add a few missing const declarations for ff_cropTbl derived pointers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTHMartin Storsjö2013-04-09
| | | | | | | | | | | | | | This was missed from 350ad50b - this fixes building the fate-srtp test. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500Andrew Van Til2013-04-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a4f26206d7914eaf2903954ce97cb7686933382': dsputil: remove butterflies_float_interleave. srtp: Move a variable to a local scope srtp: Add tests for the crypto suite with 32/80 bit HMAC Conflicts: libavcodec/x86/dsputil.asm libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Move a variable to a local scopeMartin Storsjö2013-01-21
| | | | | | | | | | | | This simplifies the code slightly. Signed-off-by: Martin Storsjö <martin@martin.st>
| * srtp: Add tests for the crypto suite with 32/80 bit HMACMartin Storsjö2013-01-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | * commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f': srtp: cosmetics: Use fewer lines for the test vectors srtp: Don't require more input data than what actually is needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: cosmetics: Use fewer lines for the test vectorsMartin Storsjö2013-01-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * srtp: Don't require more input data than what actually is neededMartin Storsjö2013-01-21
| | | | | | | | | | | | | | | | | | | | The theoretical minimum for a (not totally well formed) RTCP packet is 8 bytes, so we shouldn't require 12 bytes as minimum input. Also return AVERROR_INVALIDDATA instead of 0 if something that is not a proper packet is given. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610': srtp: Improve the minimum encryption buffer size check srtp: Add support for a few DTLS-SRTP related crypto suites Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Improve the minimum encryption buffer size checkMartin Storsjö2013-01-21
| | | | | | | | | | | | | | This clarifies where the limit number comes from, and only requires exactly as much padding space as will be needed. Signed-off-by: Martin Storsjö <martin@martin.st>
| * srtp: Add support for a few DTLS-SRTP related crypto suitesMartin Storsjö2013-01-21
| | | | | | | | | | | | | | | | The main difference to the existing suites from RFC 4568 is that the version with a 32 bit HMAC still uses 80 bit HMAC for RTCP packets. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84': rtpdec/srtp: Handle CSRC fields being present rtpdec: Check the return value from av_new_packet ac3dec: fix non-optimal dithering of zero bit mantissas Conflicts: libavcodec/ac3dec.c libavformat/rtpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec/srtp: Handle CSRC fields being presentMartin Storsjö2013-01-21
| | | | | | | | | | | | This is untested in practice, but follows the spec. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'Michael Niedermayer2013-01-16
|\| | | | | | | | | | | | | | | * commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa': rtpdec_mpeg4: Check the return value from malloc srtp: Mark a few variables as uninitialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Mark a few variables as uninitializedMartin Storsjö2013-01-15
| | | | | | | | | | | | | | This squelches false positive warnings (with gcc) about them being used uninitalized. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'Michael Niedermayer2013-01-16
|\| | | | | | | | | | | | | | | | | * commit '0eecafc948b74c247ebbc59f18f508db5d590d0b': configure: Make the new srtp protocol depend on the rtp protocol lavf: Add a fate test for the SRTP functions lavu: Add a fate test for the HMAC API Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add a fate test for the SRTP functionsMartin Storsjö2013-01-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'Michael Niedermayer2013-01-15
|/ | | | | | | | | | | | * commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d': lavf: Add functions for SRTP decryption/encryption lavu: Add an API for calculating HMAC (RFC 2104) Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: Add functions for SRTP decryption/encryptionMartin Storsjö2013-01-15
This supports the AES_CM_128_HMAC_SHA1_80 and AES_CM_128_HMAC_SHA1_32 cipher suites (from RFC 4568) at the moment. The main missing features are replay protection (which can be added later without changing the internal API), and the F8 and null ciphers. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 09:24:35 +0000