Commit 7e38340b authored by James Almer's avatar James Almer Committed by Martin Storsjö

hmac: add support for SHA-2

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent c6e0829e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "sha.h" #include "sha.h"
#include "mem.h" #include "mem.h"
#define MAX_HASHLEN 20 #define MAX_HASHLEN 32
#define MAX_BLOCKLEN 64 #define MAX_BLOCKLEN 64
struct AVHMAC { struct AVHMAC {
...@@ -39,11 +39,16 @@ struct AVHMAC { ...@@ -39,11 +39,16 @@ struct AVHMAC {
int keylen; int keylen;
}; };
static av_cold void sha1_init(void *ctx) #define DEFINE_SHA(bits) \
{ static av_cold void sha ## bits ##_init(void *ctx) \
av_sha_init(ctx, 160); { \
av_sha_init(ctx, bits); \
} }
DEFINE_SHA(160)
DEFINE_SHA(224)
DEFINE_SHA(256)
AVHMAC *av_hmac_alloc(enum AVHMACType type) AVHMAC *av_hmac_alloc(enum AVHMACType type)
{ {
AVHMAC *c = av_mallocz(sizeof(*c)); AVHMAC *c = av_mallocz(sizeof(*c));
...@@ -61,7 +66,23 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type) ...@@ -61,7 +66,23 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
case AV_HMAC_SHA1: case AV_HMAC_SHA1:
c->blocklen = 64; c->blocklen = 64;
c->hashlen = 20; c->hashlen = 20;
c->init = sha1_init; c->init = sha160_init;
c->update = av_sha_update;
c->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->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->update = av_sha_update;
c->final = av_sha_final; c->final = av_sha_final;
c->hash = av_sha_alloc(); c->hash = av_sha_alloc();
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
enum AVHMACType { enum AVHMACType {
AV_HMAC_MD5, AV_HMAC_MD5,
AV_HMAC_SHA1, AV_HMAC_SHA1,
AV_HMAC_SHA224,
AV_HMAC_SHA256,
}; };
typedef struct AVHMAC AVHMAC; typedef struct AVHMAC AVHMAC;
......
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