eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'

Browse Source 
* commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14':
  hmac: Explicitly convert types at function pointer assignment

Merged-by: Clément Bœsch <cboesch@gopro.com>
This commit is contained in:
Clément Bœsch
2017-05-05 13:27:03 +02:00
parent fcc4ed1efa 00b6a76543
commit 90fe0800fb
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libavutil/hmac.c
View File

@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stddef.h>
#include <stdint.h>
#include <string.h> #include <string.h>
#include "attributes.h" #include "attributes.h"
@@ -26,16 +28,25 @@
#include "sha.h" #include "sha.h"
#include "sha512.h" #include "sha512.h"
#include "mem.h" #include "mem.h"
#include "version.h"
#define MAX_HASHLEN 64 #define MAX_HASHLEN 64
#define MAX_BLOCKLEN 128 #define MAX_BLOCKLEN 128
typedef void (*hmac_final)(void *ctx, uint8_t *dst);
#if FF_API_CRYPTO_SIZE_T
typedef void (*hmac_update)(void *ctx, const uint8_t *src, int len);
#else
typedef void (*hmac_update)(void *ctx, const uint8_t *src, size_t len);
#endif
typedef void (*hmac_init)(void *ctx);
struct AVHMAC { struct AVHMAC {
void *hash; void *hash;
int blocklen, hashlen; int blocklen, hashlen;
void (*final)(void*, uint8_t*); hmac_final final;
void (*update)(void*, const uint8_t*, int len); hmac_update update;
void (*init)(void*); hmac_init init;
uint8_t key[MAX_BLOCKLEN]; uint8_t key[MAX_BLOCKLEN];
int keylen; int keylen;
}; };
@@ -67,49 +78,49 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
case AV_HMAC_MD5: case AV_HMAC_MD5:
c->blocklen = 64; c->blocklen = 64;
c->hashlen = 16; c->hashlen = 16;
c->init = (void*)av_md5_init; c->init = (hmac_init) av_md5_init;
c->update = (void*)av_md5_update; c->update = (hmac_update) av_md5_update;
c->final = (void*)av_md5_final; c->final = (hmac_final) av_md5_final;
c->hash = av_md5_alloc(); c->hash = av_md5_alloc();
break; break;
case AV_HMAC_SHA1: case AV_HMAC_SHA1:
c->blocklen = 64; c->blocklen = 64;
c->hashlen = 20; c->hashlen = 20;
c->init = sha160_init; c->init = sha160_init;
c->update = (void*)av_sha_update; c->update = (hmac_update) av_sha_update;
c->final = (void*)av_sha_final; c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc(); c->hash = av_sha_alloc();
break; break;
case AV_HMAC_SHA224: case AV_HMAC_SHA224:
c->blocklen = 64; c->blocklen = 64;
c->hashlen = 28; c->hashlen = 28;
c->init = sha224_init; c->init = sha224_init;
c->update = (void*)av_sha_update; c->update = (hmac_update) av_sha_update;
c->final = (void*)av_sha_final; c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc(); c->hash = av_sha_alloc();
break; break;
case AV_HMAC_SHA256: case AV_HMAC_SHA256:
c->blocklen = 64; c->blocklen = 64;
c->hashlen = 32; c->hashlen = 32;
c->init = sha256_init; c->init = sha256_init;
c->update = (void*)av_sha_update; c->update = (hmac_update) av_sha_update;
c->final = (void*)av_sha_final; c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc(); c->hash = av_sha_alloc();
break; break;
case AV_HMAC_SHA384: case AV_HMAC_SHA384:
c->blocklen = 128; c->blocklen = 128;
c->hashlen = 48; c->hashlen = 48;
c->init = sha384_init; c->init = sha384_init;
c->update = (void*)av_sha512_update; c->update = (hmac_update) av_sha512_update;
c->final = (void*)av_sha512_final; c->final = (hmac_final) av_sha512_final;
c->hash = av_sha512_alloc(); c->hash = av_sha512_alloc();
break; break;
case AV_HMAC_SHA512: case AV_HMAC_SHA512:
c->blocklen = 128; c->blocklen = 128;
c->hashlen = 64; c->hashlen = 64;
c->init = sha512_init; c->init = sha512_init;
c->update = (void*)av_sha512_update; c->update = (hmac_update) av_sha512_update;
c->final = (void*)av_sha512_final; c->final = (hmac_final) av_sha512_final;
c->hash = av_sha512_alloc(); c->hash = av_sha512_alloc();
break; break;
default: default: