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

util.hashes: Refactor hash functions to use OpenSSL EVP methods (fix #1698)

Browse source 
MD5() is deprecated, but EVP_md5() is not.

Functions in macros like this make it awkward to apply static analysis
and code formatting.
This commit is contained in:
Kim Alvefur 2020-09-10 21:58:23 +02:00
parent 34d0431440
commit d690f1502a
1 changed files with 63 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

83
util-src/hashes.c
View file

@ -46,28 +46,71 @@ static void toHex(const unsigned char *in, int length, unsigned char *out) {
} }
} }
#define MAKE_HASH_FUNCTION(myFunc, func, size) \ static int Levp_hash(lua_State *L, const EVP_MD *evp) {
static int myFunc(lua_State *L) { \ size_t len;
size_t len; \ unsigned int size = EVP_MAX_MD_SIZE;
const char *s = luaL_checklstring(L, 1, &len); \ const char *s = luaL_checklstring(L, 1, &len);
int hex_out = lua_toboolean(L, 2); \ int hex_out = lua_toboolean(L, 2);
unsigned char hash[size], result[size*2]; \
func((const unsigned char*)s, len, hash); \ unsigned char hash[EVP_MAX_MD_SIZE], result[EVP_MAX_MD_SIZE * 2];
if (hex_out) { \
toHex(hash, size, result); \ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
lua_pushlstring(L, (char*)result, size*2); \
} else { \ if(ctx == NULL) {
lua_pushlstring(L, (char*)hash, size);\ goto fail;
} \ }
return 1; \
if(!EVP_DigestInit_ex(ctx, evp, NULL)) {
goto fail;
}
if(!EVP_DigestUpdate(ctx, s, len)) {
goto fail;
}
if(!EVP_DigestFinal_ex(ctx, hash, &size)) {
goto fail;
}
EVP_MD_CTX_free(ctx);
if(hex_out) {
toHex(hash, size, result);
lua_pushlstring(L, (char *)result, size * 2);
} else {
lua_pushlstring(L, (char *)hash, size);
}
return 1;
fail:
EVP_MD_CTX_free(ctx);
return luaL_error(L, "hash function failed");
} }
MAKE_HASH_FUNCTION(Lsha1, SHA1, SHA_DIGEST_LENGTH) static int Lsha1(lua_State *L) {
MAKE_HASH_FUNCTION(Lsha224, SHA224, SHA224_DIGEST_LENGTH) return Levp_hash(L, EVP_sha1());
MAKE_HASH_FUNCTION(Lsha256, SHA256, SHA256_DIGEST_LENGTH) }
MAKE_HASH_FUNCTION(Lsha384, SHA384, SHA384_DIGEST_LENGTH)
MAKE_HASH_FUNCTION(Lsha512, SHA512, SHA512_DIGEST_LENGTH) static int Lsha224(lua_State *L) {
MAKE_HASH_FUNCTION(Lmd5, MD5, MD5_DIGEST_LENGTH) return Levp_hash(L, EVP_sha224());
}
static int Lsha256(lua_State *L) {
return Levp_hash(L, EVP_sha256());
}
static int Lsha384(lua_State *L) {
return Levp_hash(L, EVP_sha384());
}
static int Lsha512(lua_State *L) {
return Levp_hash(L, EVP_sha512());
}
static int Lmd5(lua_State *L) {
return Levp_hash(L, EVP_md5());
}
struct hash_desc { struct hash_desc {
int (*Init)(void *); int (*Init)(void *);