videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

hmac: Explicitly convert types at function pointer assignment 

Fixes a number of warnings of the type
libavutil/hmac.c:61:21: warning: assignment from incompatible pointer type
This commit is contained in:
Diego Biurrun 2015-02-05 19:45:41 +01:00
parent e435beb1ea
commit 00b6a76543
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavutil/hmac.c
View File

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stddef.h>
#include <stdint.h>
#include <string.h>
#include "attributes.h"
@ -25,16 +27,25 @@
#include "md5.h"
#include "sha.h"
#include "mem.h"
#include "version.h"
#define MAX_HASHLEN 32
#define MAX_BLOCKLEN 64
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 {
void *hash;
int blocklen, hashlen;
void (*final)(void*, uint8_t*);
void (*update)(void*, const uint8_t*, int len);
void (*init)(void*);
hmac_final final;
hmac_update update;
hmac_init init;
uint8_t key[MAX_BLOCKLEN];
int keylen;
};
@ -58,33 +69,33 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
case AV_HMAC_MD5:
c->blocklen = 64;
c->hashlen = 16;
c->init = av_md5_init;
c->update = av_md5_update;
c->final = av_md5_final;
c->init = (hmac_init) av_md5_init;
c->update = (hmac_update) av_md5_update;
c->final = (hmac_final) av_md5_final;
c->hash = av_md5_alloc();
break;
case AV_HMAC_SHA1:
c->blocklen = 64;
c->hashlen = 20;
c->init = sha160_init;
c->update = av_sha_update;
c->final = av_sha_final;
c->update = (hmac_update) av_sha_update;
c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc();
break;
case AV_HMAC_SHA224:
c->blocklen = 64;
c->hashlen = 28;
c->init = sha224_init;
c->update = av_sha_update;
c->final = av_sha_final;
c->update = (hmac_update) av_sha_update;
c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc();
break;
case AV_HMAC_SHA256:
c->blocklen = 64;
c->hashlen = 32;
c->init = sha256_init;
c->update = av_sha_update;
c->final = av_sha_final;
c->update = (hmac_update) av_sha_update;
c->final = (hmac_final) av_sha_final;
c->hash = av_sha_alloc();
break;
default: