summaryrefslogtreecommitdiffstats
path: root/libavformat/srtp.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'Michael Niedermayer2013-01-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | * 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: Add support for a few DTLS-SRTP related crypto suitesMartin Storsjö2013-01-211-1/+1
| | | | | | | | | | | | | | | | 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 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'Michael Niedermayer2013-01-151-4/+4
|/ | | | | | | | | | | | * 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-151-0/+52
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>
OpenPOWER on IntegriCloud