mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.hashes: Refactor HMAC bindings (fixes #1589)

Browse source 
HMAC() is deprecated

As with the regular hash functions, macros like this make it awkward to
apply static analysis and code formatting.
This commit is contained in:
Kim Alvefur 2020-11-29 17:58:30 +01:00
parent d690f1502a
commit 54f8ca81f4
1 changed files with 59 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

79
util-src/hashes.c
View file

@ -120,28 +120,67 @@ struct hash_desc {
void *ctx, *ctxo; void *ctx, *ctxo;
}; };
#define MAKE_HMAC_FUNCTION(myFunc, evp, size, type) \ static int Levp_hmac(lua_State *L, const EVP_MD *evp) {
static int myFunc(lua_State *L) { \ unsigned char hash[EVP_MAX_MD_SIZE], result[EVP_MAX_MD_SIZE * 2];
unsigned char hash[size], result[2*size]; \ size_t key_len, msg_len;
size_t key_len, msg_len; \ size_t out_len = EVP_MAX_MD_SIZE;
unsigned int out_len; \ const char *key = luaL_checklstring(L, 1, &key_len);
const char *key = luaL_checklstring(L, 1, &key_len); \ const char *msg = luaL_checklstring(L, 2, &msg_len);
const char *msg = luaL_checklstring(L, 2, &msg_len); \ const int hex_out = lua_toboolean(L, 3);
const int hex_out = lua_toboolean(L, 3); \
HMAC(evp(), key, key_len, (const unsigned char*)msg, msg_len, (unsigned char*)hash, &out_len); \ EVP_PKEY *pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL, (unsigned char *)key, key_len);
if (hex_out) { \ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
toHex(hash, out_len, result); \
lua_pushlstring(L, (char*)result, out_len*2); \ if(ctx == NULL || pkey == NULL) {
} else { \ goto fail;
lua_pushlstring(L, (char*)hash, out_len); \ }
} \
return 1; \ if(!EVP_DigestSignInit(ctx, NULL, evp, NULL, pkey)) {
goto fail;
}
if(!EVP_DigestSignUpdate(ctx, msg, msg_len)) {
goto fail;
}
if(!EVP_DigestSignFinal(ctx, hash, &out_len)) {
goto fail;
}
EVP_MD_CTX_free(ctx);
EVP_PKEY_free(pkey);
if(hex_out) {
toHex(hash, out_len, result);
lua_pushlstring(L, (char *)result, out_len * 2);
} else {
lua_pushlstring(L, (char *)hash, out_len);
}
return 1;
fail:
EVP_MD_CTX_free(ctx);
EVP_PKEY_free(pkey);
return luaL_error(L, "hash function failed");
}
static int Lhmac_sha1(lua_State *L) {
return Levp_hmac(L, EVP_sha1());
}
static int Lhmac_sha256(lua_State *L) {
return Levp_hmac(L, EVP_sha256());
}
static int Lhmac_sha512(lua_State *L) {
return Levp_hmac(L, EVP_sha512());
}
static int Lhmac_md5(lua_State *L) {
return Levp_hmac(L, EVP_md5());
} }
MAKE_HMAC_FUNCTION(Lhmac_sha1, EVP_sha1, SHA_DIGEST_LENGTH, SHA_CTX)
MAKE_HMAC_FUNCTION(Lhmac_sha256, EVP_sha256, SHA256_DIGEST_LENGTH, SHA256_CTX)
MAKE_HMAC_FUNCTION(Lhmac_sha512, EVP_sha512, SHA512_DIGEST_LENGTH, SHA512_CTX)
MAKE_HMAC_FUNCTION(Lhmac_md5, EVP_md5, MD5_DIGEST_LENGTH, MD5_CTX)
static int Lpbkdf2_sha1(lua_State *L) { static int Lpbkdf2_sha1(lua_State *L) {
unsigned char out[SHA_DIGEST_LENGTH]; unsigned char out[SHA_DIGEST_LENGTH];