diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:07:04 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:07:27 +0100 |
commit | 9ea65c65f70029896b1c23afd9925ae42c4d009f (patch) | |
tree | 213694091e2eb5a1480ca8427649f8be51be0a17 /tests | |
parent | 06af724c56c9fd74bb6ace457f39e1768bd94246 (diff) | |
parent | 0eecafc948b74c247ebbc59f18f508db5d590d0b (diff) | |
download | ffmpeg-streaming-9ea65c65f70029896b1c23afd9925ae42c4d009f.zip ffmpeg-streaming-9ea65c65f70029896b1c23afd9925ae42c4d009f.tar.gz |
Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'
* 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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/libavformat.mak | 4 | ||||
-rw-r--r-- | tests/fate/libavutil.mak | 4 | ||||
-rw-r--r-- | tests/ref/fate/hmac | 6 | ||||
-rw-r--r-- | tests/ref/fate/srtp | 8 |
4 files changed, 22 insertions, 0 deletions
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index b6eda42..20bc319 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -1,3 +1,7 @@ +FATE_LIBAVFORMAT += fate-srtp +fate-srtp: libavformat/srtp-test$(EXESUF) +fate-srtp: CMD = run libavformat/srtp-test + FATE_LIBAVFORMAT += fate-url fate-url: libavformat/url-test$(EXESUF) fate-url: CMD = run libavformat/url-test diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index b2484a5..ac5e933 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -41,6 +41,10 @@ FATE_LIBAVUTIL += fate-fifo fate-fifo: libavutil/fifo-test$(EXESUF) fate-fifo: CMD = run libavutil/fifo-test +FATE_LIBAVUTIL += fate-hmac +fate-hmac: libavutil/hmac-test$(EXESUF) +fate-hmac: CMD = run libavutil/hmac-test + FATE_LIBAVUTIL += fate-md5 fate-md5: libavutil/md5-test$(EXESUF) fate-md5: CMD = run libavutil/md5-test diff --git a/tests/ref/fate/hmac b/tests/ref/fate/hmac new file mode 100644 index 0000000..7d2a437 --- /dev/null +++ b/tests/ref/fate/hmac @@ -0,0 +1,6 @@ +9294727a3638bb1c13f48ef8158bfc9d +750c783e6ab0b503eaa86e310a5db738 +56be34521d144c88dbb8c733f0e8b3f6 +467cb2560355d7fa3ab2d6b939e6e47c +5a6ffd741d3e23b12f78b1baee9e609a +8b4b9d11c9e186c58f2a53b08ddfa436 diff --git a/tests/ref/fate/srtp b/tests/ref/fate/srtp new file mode 100644 index 0000000..091d3f3 --- /dev/null +++ b/tests/ref/fate/srtp @@ -0,0 +1,8 @@ +80e0123412345678123456780102030405 +Decrypted content matches input +Decrypted content matches input +81c90007123456788765432100000000000012340000069ec73069ba000001fd +Decrypted content matches input +Decrypted content matches input +80e0123412345678123456780102030405 +81c90007123456788765432100000000000012340000069ec73069ba000001fd |