[libav-commits] srtp: cosmetics: Use fewer lines for the test vectors

Martin Storsjö git at libav.org
Sun Jan 20 23:15:54 CET 2013


Module: libav
Branch: master
Commit: 3ef6d22e1ba544ab37c73e8fc61382f13aac250f

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Fri Jan 18 13:46:16 2013 +0200

srtp: cosmetics: Use fewer lines for the test vectors

Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavformat/srtp.c |   30 ++++++++----------------------
 1 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/libavformat/srtp.c b/libavformat/srtp.c
index d826b4e..0fa0d19 100644
--- a/libavformat/srtp.c
+++ b/libavformat/srtp.c
@@ -330,9 +330,7 @@ static const char *aes128_80_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn";
 
 static const uint8_t rtp_aes128_80[] = {
     // RTP header
-    0x80, 0xe0, 0x12, 0x34,
-    0x12, 0x34, 0x56, 0x78,
-    0x12, 0x34, 0x56, 0x78,
+    0x80, 0xe0, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78,
     // encrypted payload
     0x62, 0x69, 0x76, 0xca, 0xc5,
     // HMAC
@@ -341,15 +339,10 @@ static const uint8_t rtp_aes128_80[] = {
 
 static const uint8_t rtcp_aes128_80[] = {
     // RTCP header
-    0x81, 0xc9, 0x00, 0x07,
-    0x12, 0x34, 0x56, 0x78,
+    0x81, 0xc9, 0x00, 0x07, 0x12, 0x34, 0x56, 0x78,
     // encrypted payload
-    0x8a, 0xac, 0xdc, 0xa5,
-    0x4c, 0xf6, 0x78, 0xa6,
-    0x62, 0x8f, 0x24, 0xda,
-    0x6c, 0x09, 0x3f, 0xa9,
-    0x28, 0x7a, 0xb5, 0x7f,
-    0x1f, 0x0f, 0xc9, 0x35,
+    0x8a, 0xac, 0xdc, 0xa5, 0x4c, 0xf6, 0x78, 0xa6, 0x62, 0x8f, 0x24, 0xda,
+    0x6c, 0x09, 0x3f, 0xa9, 0x28, 0x7a, 0xb5, 0x7f, 0x1f, 0x0f, 0xc9, 0x35,
     // RTCP index
     0x80, 0x00, 0x00, 0x03,
     // HMAC
@@ -360,9 +353,7 @@ static const char *aes128_32_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn";
 
 static const uint8_t rtp_aes128_32[] = {
     // RTP header
-    0x80, 0xe0, 0x12, 0x34,
-    0x12, 0x34, 0x56, 0x78,
-    0x12, 0x34, 0x56, 0x78,
+    0x80, 0xe0, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78,
     // encrypted payload
     0x62, 0x69, 0x76, 0xca, 0xc5,
     // HMAC
@@ -371,15 +362,10 @@ static const uint8_t rtp_aes128_32[] = {
 
 static const uint8_t rtcp_aes128_32[] = {
     // RTCP header
-    0x81, 0xc9, 0x00, 0x07,
-    0x12, 0x34, 0x56, 0x78,
+    0x81, 0xc9, 0x00, 0x07, 0x12, 0x34, 0x56, 0x78,
     // encrypted payload
-    0x35, 0xe9, 0xb5, 0xff,
-    0x0d, 0xd1, 0xde, 0x70,
-    0x74, 0x10, 0xaa, 0x1b,
-    0xb2, 0x8d, 0xf0, 0x20,
-    0x02, 0x99, 0x6b, 0x1b,
-    0x0b, 0xd0, 0x47, 0x34,
+    0x35, 0xe9, 0xb5, 0xff, 0x0d, 0xd1, 0xde, 0x70, 0x74, 0x10, 0xaa, 0x1b,
+    0xb2, 0x8d, 0xf0, 0x20, 0x02, 0x99, 0x6b, 0x1b, 0x0b, 0xd0, 0x47, 0x34,
     // RTCP index
     0x80, 0x00, 0x00, 0x04,
     // HMAC



More information about the libav-commits mailing list