stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

hmac: add sha256 support

Browse source
This commit is contained in:
Richard Aas 2016-02-01 08:04:53 +00:00
parent a9a987942d
commit bfa2112207
3 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/re_hmac.h
View file

@ -14,7 +14,8 @@ void hmac_sha1(const uint8_t *k, /* secret key */
enum hmac_hash { enum hmac_hash {
HMAC_HASH_SHA1 HMAC_HASH_SHA1,
HMAC_HASH_SHA256
}; };
struct hmac; struct hmac;

20
src/hmac/apple/hmac.c
View file

@ -12,12 +12,13 @@
#include <re_hmac.h> #include <re_hmac.h>
enum { KEY_SIZE = 20 }; enum { KEY_SIZE = 256 };
struct hmac { struct hmac {
CCHmacContext ctx; CCHmacContext ctx;
uint8_t key[KEY_SIZE]; uint8_t key[KEY_SIZE];
size_t key_len; size_t key_len;
CCHmacAlgorithm algo;
}; };
@ -33,12 +34,24 @@ int hmac_create(struct hmac **hmacp, enum hmac_hash hash,
const uint8_t *key, size_t key_len) const uint8_t *key, size_t key_len)
{ {
struct hmac *hmac; struct hmac *hmac;
CCHmacAlgorithm algo;
if (!hmacp || !key || !key_len || key_len > KEY_SIZE) if (!hmacp || !key || !key_len || key_len > KEY_SIZE)
return EINVAL; return EINVAL;
if (hash != HMAC_HASH_SHA1) switch (hash) {
case HMAC_HASH_SHA1:
algo = kCCHmacAlgSHA1;
break;
case HMAC_HASH_SHA256:
algo = kCCHmacAlgSHA256;
break;
default:
return ENOTSUP; return ENOTSUP;
}
hmac = mem_zalloc(sizeof(*hmac), destructor); hmac = mem_zalloc(sizeof(*hmac), destructor);
if (!hmac) if (!hmac)
@ -46,6 +59,7 @@ int hmac_create(struct hmac **hmacp, enum hmac_hash hash,
memcpy(hmac->key, key, key_len); memcpy(hmac->key, key, key_len);
hmac->key_len = key_len; hmac->key_len = key_len;
hmac->algo = algo;
*hmacp = hmac; *hmacp = hmac;
@ -60,7 +74,7 @@ int hmac_digest(struct hmac *hmac, uint8_t *md, size_t md_len,
return EINVAL; return EINVAL;
/* reset state */ /* reset state */
CCHmacInit(&hmac->ctx, kCCHmacAlgSHA1, hmac->key, hmac->key_len); CCHmacInit(&hmac->ctx, hmac->algo, hmac->key, hmac->key_len);
CCHmacUpdate(&hmac->ctx, data, data_len); CCHmacUpdate(&hmac->ctx, data, data_len);
CCHmacFinal(&hmac->ctx, md); CCHmacFinal(&hmac->ctx, md);

18
src/hmac/openssl/hmac.c
View file

@ -28,13 +28,25 @@ int hmac_create(struct hmac **hmacp, enum hmac_hash hash,
const uint8_t *key, size_t key_len) const uint8_t *key, size_t key_len)
{ {
struct hmac *hmac; struct hmac *hmac;
const EVP_MD *evp;
int err = 0; int err = 0;
if (!hmacp || !key || !key_len) if (!hmacp || !key || !key_len)
return EINVAL; return EINVAL;
if (hash != HMAC_HASH_SHA1) switch (hash) {
case HMAC_HASH_SHA1:
evp = EVP_sha1();
break;
case HMAC_HASH_SHA256:
evp = EVP_sha256();
break;
default:
return ENOTSUP; return ENOTSUP;
}
hmac = mem_zalloc(sizeof(*hmac), destructor); hmac = mem_zalloc(sizeof(*hmac), destructor);
if (!hmac) if (!hmac)
@ -43,12 +55,12 @@ int hmac_create(struct hmac **hmacp, enum hmac_hash hash,
HMAC_CTX_init(&hmac->ctx); HMAC_CTX_init(&hmac->ctx);
#if (OPENSSL_VERSION_NUMBER >= 0x00909000) #if (OPENSSL_VERSION_NUMBER >= 0x00909000)
if (!HMAC_Init_ex(&hmac->ctx, key, (int)key_len, EVP_sha1(), NULL)) { if (!HMAC_Init_ex(&hmac->ctx, key, (int)key_len, evp, NULL)) {
ERR_clear_error(); ERR_clear_error();
err = EPROTO; err = EPROTO;
} }
#else #else
HMAC_Init_ex(&hmac->ctx, key, (int)key_len, EVP_sha1(), NULL); HMAC_Init_ex(&hmac->ctx, key, (int)key_len, evp, NULL);
#endif #endif
if (err) if (err)