On Tue, May 17, 2016 at 12:49 PM, Diego Biurrun <[email protected]> wrote:
> ---
> libavutil/tests/xtea.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/libavutil/tests/xtea.c b/libavutil/tests/xtea.c
> index 326f271..09a4daf 100644
> --- a/libavutil/tests/xtea.c
> +++ b/libavutil/tests/xtea.c
> @@ -22,6 +22,7 @@
> #include <string.h>
>
> #include "libavutil/intreadwrite.h"
> +#include "libavutil/mem.h"
> #include "libavutil/xtea.h"
>
> #define XTEA_NUM_TESTS 6
> @@ -80,41 +81,44 @@ static void test_xtea(AVXTEA *ctx, uint8_t *dst, const
> uint8_t *src,
>
> int main(void)
> {
> - AVXTEA ctx;
> uint8_t buf[16], iv[8];
> int i, j;
> static const uint8_t src[32] = "HelloWorldHelloWorldHelloWorld";
> uint8_t ct[32];
> uint8_t pl[32];
> + AVXTEA *ctx = av_xtea_alloc();
> + if (!ctx)
> + return -1;
I think you have to return positive values for errors.
Ok otherwise (same for the other patch).
> for (i = 0; i < XTEA_NUM_TESTS; i++) {
> - av_xtea_init(&ctx, xtea_test_key[i]);
> + av_xtea_init(ctx, xtea_test_key[i]);
>
> - test_xtea(&ctx, buf, xtea_test_pt[i], xtea_test_ct[i], 1, NULL, 0,
> "encryption", av_xtea_crypt);
> - test_xtea(&ctx, buf, xtea_test_ct[i], xtea_test_pt[i], 1, NULL, 1,
> "decryption", av_xtea_crypt);
> + test_xtea(ctx, buf, xtea_test_pt[i], xtea_test_ct[i], 1, NULL, 0,
> "encryption", av_xtea_crypt);
> + test_xtea(ctx, buf, xtea_test_ct[i], xtea_test_pt[i], 1, NULL, 1,
> "decryption", av_xtea_crypt);
>
> for (j = 0; j < 4; j++)
> AV_WL32(&buf[4*j], AV_RB32(&xtea_test_key[i][4*j]));
> - av_xtea_le_init(&ctx, buf);
> + av_xtea_le_init(ctx, buf);
> for (j = 0; j < 2; j++) {
> AV_WL32(&ct[4*j], AV_RB32(&xtea_test_ct[i][4*j]));
> AV_WL32(&pl[4*j], AV_RB32(&xtea_test_pt[i][4*j]));
> }
> - test_xtea(&ctx, buf, pl, ct, 1, NULL, 0, "encryption",
> av_xtea_le_crypt);
> - test_xtea(&ctx, buf, ct, pl, 1, NULL, 1, "decryption",
> av_xtea_le_crypt);
> + test_xtea(ctx, buf, pl, ct, 1, NULL, 0, "encryption",
> av_xtea_le_crypt);
> + test_xtea(ctx, buf, ct, pl, 1, NULL, 1, "decryption",
> av_xtea_le_crypt);
>
> /* encrypt */
> memcpy(iv, "HALLO123", 8);
> - av_xtea_crypt(&ctx, ct, src, 4, iv, 0);
> + av_xtea_crypt(ctx, ct, src, 4, iv, 0);
>
> /* decrypt into pl */
> memcpy(iv, "HALLO123", 8);
> - test_xtea(&ctx, pl, ct, src, 4, iv, 1, "CBC decryption",
> av_xtea_crypt);
> + test_xtea(ctx, pl, ct, src, 4, iv, 1, "CBC decryption",
> av_xtea_crypt);
>
> memcpy(iv, "HALLO123", 8);
> - test_xtea(&ctx, ct, ct, src, 4, iv, 1, "CBC inplace decryption",
> av_xtea_crypt);
> + test_xtea(ctx, ct, ct, src, 4, iv, 1, "CBC inplace decryption",
> av_xtea_crypt);
> }
> printf("Test encryption/decryption success.\n");
> + av_free(ctx);
>
> return 0;
> }
> --
> 2.7.3
>
> _______________________________________________
> libav-devel mailing list
> [email protected]
> https://lists.libav.org/mailman/listinfo/libav-devel
--
Vittorio
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
