Skip to content

F
ffmpeg.wasm-core
Commit 359af6a7 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge branch 'crypto' of https://github.com/jamrial/FFmpeg 

Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8a79a009 99b8cd0c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 586 additions and 8 deletions
MAINTAINERS
View file @ 359af6a7
......@@ -68,6 +68,7 @@ Other:
integer.c, integer.h Michael Niedermayer
bswap.h
opencl.c, opencl.h Wei Gao
ripemd.c, ripemd.h James Almer
libavcodec
......
doc/APIchanges
View file @ 359af6a7
......@@ -16,6 +16,13 @@ libavutil: 2012-10-22
API changes, most recent first:
2013-06-xx - xxxxxxx - lavu 52.36.100
Add AVRIPEMD:
av_ripemd_alloc()
av_ripemd_init()
av_ripemd_update()
av_ripemd_final()
2013-06-05 - fc962d4 - lavu 52.13.0 - mem.h
Add av_realloc_array and av_reallocp_array
......
libavformat/md5enc.c
View file @ 359af6a7
......@@ -35,7 +35,7 @@ struct MD5Context {
static void md5_finish(struct AVFormatContext *s, char *buf)
{
struct MD5Context *c = s->priv_data;
uint8_t md5[32];
uint8_t md5[AV_HASH_MAX_SIZE];
int i, offset = strlen(buf);
int len = av_hash_get_size(c->hash);
av_assert0(len > 0 && len <= sizeof(md5));
......@@ -86,9 +86,9 @@ static int write_packet(struct AVFormatContext *s, AVPacket *pkt)
static int write_trailer(struct AVFormatContext *s)
{
struct MD5Context *c = s->priv_data;
char buf[128];
av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 100);
av_strlcat(buf, "=", sizeof(buf) - 100);
char buf[256];
av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 200);
av_strlcat(buf, "=", sizeof(buf) - 200);
md5_finish(s, buf);
......
libavformat/version.h
View file @ 359af6a7
......@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 8
#define LIBAVFORMAT_VERSION_MICRO 102
#define LIBAVFORMAT_VERSION_MICRO 103
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
......
libavutil/Makefile
View file @ 359af6a7
......@@ -43,6 +43,7 @@ HEADERS = adler32.h \
pixfmt.h \
random_seed.h \
rational.h \
ripemd.h \
samplefmt.h \
sha.h \
sha512.h \
......@@ -102,6 +103,7 @@ OBJS = adler32.o \
random_seed.o \
rational.o \
rc4.o \
ripemd.o \
samplefmt.o \
sha.o \
sha512.o \
......@@ -148,6 +150,7 @@ TESTPROGS = adler32 \
parseutils \
random_seed \
rational \
ripemd \
sha \
sha512 \
tree \
......
libavutil/hash.c
View file @ 359af6a7
......@@ -25,6 +25,7 @@
#include "md5.h"
#include "murmur3.h"
#include "sha.h"
#include "sha512.h"
#include "avstring.h"
#include "error.h"
......@@ -37,6 +38,10 @@ enum hashtype {
SHA160,
SHA224,
SHA256,
SHA512_224,
SHA512_256,
SHA384,
SHA512,
CRC32,
ADLER32,
NUM_HASHES
......@@ -58,6 +63,10 @@ struct {
[SHA160] = {"SHA160", 20},
[SHA224] = {"SHA224", 28},
[SHA256] = {"SHA256", 32},
[SHA512_224] = {"SHA512/224", 28},
[SHA512_256] = {"SHA512/256", 32},
[SHA384] = {"SHA384", 48},
[SHA512] = {"SHA512", 64},
[CRC32] = {"CRC32", 4},
[ADLER32] = {"adler32", 4},
};
......@@ -96,6 +105,10 @@ int av_hash_alloc(AVHashContext **ctx, const char *name)
case SHA160:
case SHA224:
case SHA256: res->ctx = av_sha_alloc(); break;
case SHA512_224:
case SHA512_256:
case SHA384:
case SHA512: res->ctx = av_sha512_alloc(); break;
case CRC32: res->crctab = av_crc_get_table(AV_CRC_32_IEEE_LE); break;
case ADLER32: break;
}
......@@ -115,6 +128,10 @@ void av_hash_init(AVHashContext *ctx)
case SHA160: av_sha_init(ctx->ctx, 160); break;
case SHA224: av_sha_init(ctx->ctx, 224); break;
case SHA256: av_sha_init(ctx->ctx, 256); break;
case SHA512_224: av_sha512_init(ctx->ctx, 224); break;
case SHA512_256: av_sha512_init(ctx->ctx, 256); break;
case SHA384: av_sha512_init(ctx->ctx, 384); break;
case SHA512: av_sha512_init(ctx->ctx, 512); break;
case CRC32: ctx->crc = UINT32_MAX; break;
case ADLER32: ctx->crc = 1; break;
}
......@@ -128,6 +145,10 @@ void av_hash_update(AVHashContext *ctx, const uint8_t *src, int len)
case SHA160:
case SHA224:
case SHA256: av_sha_update(ctx->ctx, src, len); break;
case SHA512_224:
case SHA512_256:
case SHA384:
case SHA512: av_sha512_update(ctx->ctx, src, len); break;
case CRC32: ctx->crc = av_crc(ctx->crctab, ctx->crc, src, len); break;
case ADLER32: ctx->crc = av_adler32_update(ctx->crc, src, len); break;
}
......@@ -141,6 +162,10 @@ void av_hash_final(AVHashContext *ctx, uint8_t *dst)
case SHA160:
case SHA224:
case SHA256: av_sha_final(ctx->ctx, dst); break;
case SHA512_224:
case SHA512_256:
case SHA384:
case SHA512: av_sha512_final(ctx->ctx, dst); break;
case CRC32: AV_WB32(dst, ctx->crc ^ UINT32_MAX); break;
case ADLER32: AV_WB32(dst, ctx->crc); break;
}
......
libavutil/hash.h
View file @ 359af6a7
......@@ -58,7 +58,7 @@ const char *av_hash_get_name(const struct AVHashContext *ctx);
* with larger sizes will not be considered an ABI change and should not cause
* your code to overflow a buffer.
*/
#define AV_HASH_MAX_SIZE 32
#define AV_HASH_MAX_SIZE 64
/**
* Get the size of the resulting hash value in bytes.
......
libavutil/ripemd.c 0 → 100644
View file @ 359af6a7
This diff is collapsed.
libavutil/ripemd.h 0 → 100644
View file @ 359af6a7
/*
* Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
* Copyright (C) 2013 James Almer <jamrial@gmail.com>
*
* 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
*/
#ifndef AVUTIL_RIPEMD_H
#define AVUTIL_RIPEMD_H
#include <stdint.h>
#include "attributes.h"
#include "version.h"
/**
* @defgroup lavu_ripemd RIPEMD
* @ingroup lavu_crypto
* @{
*/
extern const int av_ripemd_size;
struct AVRIPEMD;
/**
* Allocate an AVRIPEMD context.
*/
struct AVRIPEMD *av_ripemd_alloc(void);
/**
* Initialize RIPEMD hashing.
*
* @param context pointer to the function context (of size av_ripemd_size)
* @param bits number of bits in digest (128, 160, 256 or 320 bits)
* @return zero if initialization succeeded, -1 otherwise
*/
int av_ripemd_init(struct AVRIPEMD* context, int bits);
/**
* Update hash value.
*
* @param context hash function context
* @param data input data to update hash with
* @param len input data length
*/
void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, unsigned int len);
/**
* Finish hashing and output digest value.
*
* @param context hash function context
* @param digest buffer where output digest value is stored
*/
void av_ripemd_final(struct AVRIPEMD* context, uint8_t *digest);
/**
* @}
*/
#endif /* AVUTIL_RIPEMD_H */
libavutil/version.h
View file @ 359af6a7
......@@ -75,8 +75,8 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 35
#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_MINOR 37
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
......
tests/fate/libavutil.mak
View file @ 359af6a7
......@@ -66,6 +66,10 @@ FATE_LIBAVUTIL += fate-random_seed
fate-random_seed: libavutil/random_seed-test$(EXESUF)
fate-random_seed: CMD = run libavutil/random_seed-test
FATE_LIBAVUTIL += fate-ripemd
fate-ripemd: libavutil/ripemd-test$(EXESUF)
fate-ripemd: CMD = run libavutil/ripemd-test
FATE_LIBAVUTIL += fate-sha
fate-sha: libavutil/sha-test$(EXESUF)
fate-sha: CMD = run libavutil/sha-test
......
tests/ref/fate/ripemd 0 → 100644
View file @ 359af6a7
Testing RIPEMD-128
C14A12199C66E4BA84636B0F69144C77
A1AA0689D0FAFA2DDC22E88B49133A06
4A7F5723F954EBA1216C9D8F6320431F
c14a1219 9c66e4ba 84636b0f 69144c77
a1aa0689 d0fafa2d dc22e88b 49133a06
4a7f5723 f954eba1 216c9d8f 6320431f
Testing RIPEMD-160
8EB208F7E05D987A9B044A8E98C6B087F15A0BFC
12A053384A9C0C88E405A06C27DCF49ADA62EB2B
52783243C1697BDBE16D37F97F68F08325DC1528
8eb208f7 e05d987a 9b044a8e 98c6b087 f15a0bfc
12a05338 4a9c0c88 e405a06c 27dcf49a da62eb2b
52783243 c1697bdb e16d37f9 7f68f083 25dc1528
Testing RIPEMD-256
AFBD6E228B9D8CBBCEF5CA2D03E6DBA10AC0BC7DCBE4680E1E42D2E975459B65
3843045583AAC6C8C8D9128573E7A9809AFB2A0F34CCC36EA9E72F16F6368E3F
AC953744E10E31514C150D4D8D7B677342E33399788296E43AE4850CE4F97978
afbd6e22 8b9d8cbb cef5ca2d 03e6dba1 0ac0bc7d cbe4680e 1e42d2e9 75459b65
38430455 83aac6c8 c8d91285 73e7a980 9afb2a0f 34ccc36e a9e72f16 f6368e3f
ac953744 e10e3151 4c150d4d 8d7b6773 42e33399 788296e4 3ae4850c e4f97978
Testing RIPEMD-320
DE4C01B3054F8930A79D09AE738E92301E5A17085BEFFDC1B8D116713E74F82FA942D64CDBC4682D
D034A7950CF722021BA4B84DF769A5DE2060E259DF4C9BB4A4268C0E935BBC7470A969C9D072A1AC
BDEE37F4371E20646B8B0D862DDA16292AE36F40965E8C8509E63D1DBDDECC503E2B63EB9245BB66
de4c01b3 054f8930 a79d09ae 738e9230 1e5a1708 5beffdc1 b8d11671 3e74f82f a942d64c dbc4682d
d034a795 0cf72202 1ba4b84d f769a5de 2060e259 df4c9bb4 a4268c0e 935bbc74 70a969c9 d072a1ac
bdee37f4 371e2064 6b8b0d86 2dda1629 2ae36f40 965e8c85 09e63d1d bddecc50 3e2b63eb 9245bb66
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment