[FFmpeg-cvslog] xtea-test: factorize test code

Michael Niedermayer git at videolan.org
Sun Sep 30 17:53:51 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 30 17:19:54 2012 +0200| [a0321dadfde0e000de4e67cf9c709b8c667a02f8] | committer: Michael Niedermayer

xtea-test: factorize test code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0321dadfde0e000de4e67cf9c709b8c667a02f8
---

 libavutil/xtea.c |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index d9c2858..bfc613d 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -227,20 +227,19 @@ int main(void)
     uint8_t buf[8];
     int i;
 
+#define CHECK(dst, src, ref, len, iv, dir, error) \
+        av_xtea_crypt(&ctx, dst, src, len, iv, dir);\
+        if (memcmp(dst, ref, 8*len)) {\
+            printf(error);\
+            return 1;\
+        }
+
     for (i = 0; i < XTEA_NUM_TESTS; i++) {
         av_xtea_init(&ctx, xtea_test_key[i]);
 
-        av_xtea_crypt(&ctx, buf, xtea_test_pt[i], 1, NULL, 0);
-        if (memcmp(buf, xtea_test_ct[i], 8)) {
-            printf("Test encryption failed.\n");
-            return 1;
-        }
+        CHECK(buf, xtea_test_pt[i], xtea_test_ct[i], 1, NULL, 0, "Test encryption failed.\n");
+        CHECK(buf, xtea_test_ct[i], xtea_test_pt[i], 1, NULL, 1, "Test decryption failed.\n");
 
-        av_xtea_crypt(&ctx, buf, xtea_test_ct[i], 1, NULL, 1);
-        if (memcmp(buf, xtea_test_pt[i], 8)) {
-            printf("Test decryption failed.\n");
-            return 1;
-        }
     }
     printf("Test encryption/decryption success.\n");
 



More information about the ffmpeg-cvslog mailing list