On Fri, Dec 30, 2016 at 01:36:35AM -0800, Thomas Turner wrote: > Signed-off-by: Thomas Turner <thomas...@googlemail.com> > --- > libavutil/Makefile | 1 + > libavutil/tests/aes_ctr.c | 70 > +++++++++++++++++++++++++++++++++++++++++++++++ > tests/fate/libavutil.mak | 5 ++++ > 3 files changed, 76 insertions(+) > create mode 100644 libavutil/tests/aes_ctr.c > > diff --git a/libavutil/Makefile b/libavutil/Makefile > index 2dd91b8..15d95de 100644 > --- a/libavutil/Makefile > +++ b/libavutil/Makefile > @@ -181,6 +181,7 @@ SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h > > TESTPROGS = adler32 \ > aes \ > + aes_ctr \ > atomic \ > audio_fifo \ > avstring \ > diff --git a/libavutil/tests/aes_ctr.c b/libavutil/tests/aes_ctr.c > new file mode 100644 > index 0000000..8216b20 > --- /dev/null > +++ b/libavutil/tests/aes_ctr.c > @@ -0,0 +1,70 @@ > +/* > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 > USA > + */ > + > +#include <string.h> > +#include "libavutil/log.h" > +#include "libavutil/mem.h" > +#include "libavutil/aes_ctr.h" > +#include "libavutil/aes.h" > +
> +const DECLARE_ALIGNED(8, uint8_t, plain)[] = {
static const
> + 0x6d, 0x6f, 0x73, 0x74, ' ', 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d
> +};
> +static DECLARE_ALIGNED(8, uint8_t, tmp)[11];
> +
> +int main (void)
> +{
> + struct AVAESCTR *ae, *ad;
> + const uint8_t *iv;
> +
> + ae = av_aes_ctr_alloc();
> + ad = av_aes_ctr_alloc();
> +
> + if (!ae || !ad)
> + goto ERROR;
> +
> + if (av_aes_ctr_init(ae, (const uint8_t*)"0123456789abcdef") < 0)
> + goto ERROR;
> +
> + if (av_aes_ctr_init(ad, (const uint8_t*)"0123456789abcdef") < 0)
> + goto ERROR;
> +
> + av_aes_ctr_set_random_iv(ae);
> + iv = av_aes_ctr_get_iv(ae);
> + av_aes_ctr_set_iv(ad, iv);
> +
> + av_aes_ctr_crypt(ae, tmp, plain, sizeof(tmp));
> + av_aes_ctr_crypt(ad, tmp, tmp, sizeof(tmp));
> +
> + if (memcmp(tmp, plain, sizeof(tmp)) != 0){
> + av_log(NULL, AV_LOG_ERROR, "test failed\n");
> + goto ERROR;
> + }
> +
> + av_log(NULL, AV_LOG_INFO, "test passed\n");
> + #define DEALLOCATE() \
> + av_aes_ctr_free(ae); \
> + av_aes_ctr_free(ad);
> +
> + DEALLOCATE();
> + return 0;
> +
> +ERROR:
> + DEALLOCATE();
> + return 1;
> +}
thats longer than just writing the free twice
or
the #define could be avoided using
int ret = 1;
...
ret = 0;
ERROR:
av_aes_ctr_free(ae);
av_aes_ctr_free(ad);
return ret
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
I am the wisest man alive, for I know one thing, and that is that I know
nothing. -- Socrates
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
