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

Backed out changeset 61bc5c52c941

Browse source 
luaL_buffinitsize is only available in Lua 5.2+
This commit is contained in:
Kim Alvefur 2019-04-21 00:59:36 +02:00
parent 165ee3a5ef
commit 90d4d6bda8
2 changed files with 9 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spec/util_hashes_spec.lua
View file

@ -33,21 +33,5 @@ describe("PBKDF2-SHA1", function ()
local DK = "eefe3d61cd4da4e4e9945b3d6ba2158c2634e984";
assert.equal(DK, hex.to(hashes.scram_Hi_sha1(P, S, c)));
end);
it("test vector 5", function ()
local P = "passwordPASSWORDpassword"
local S = "saltSALTsaltSALTsaltSALTsaltSALTsalt"
local c = 4096
local dkLen = 25
local DK = "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038"
assert.equal(DK, hex.to(hashes.scram_Hi_sha1(P, S, c, dkLen)));
end);
it("works", function ()
local P = "pass\0word"
local S = "sa\0lt"
local c = 4096
local dkLen = 16
local DK = "56fa6aa75548099dcc37d7f03425e0c3"
assert.equal(DK, hex.to(hashes.scram_Hi_sha1(P, S, c, dkLen)));
end);
end);

21
util-src/hashes.c
View file

@ -100,39 +100,36 @@ 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) {
unsigned char out[SHA_DIGEST_LENGTH];
size_t pass_len, salt_len;
const char *pass = luaL_checklstring(L, 1, &pass_len);
const unsigned char *salt = (unsigned char *)luaL_checklstring(L, 2, &salt_len);
const int iter = luaL_checkinteger(L, 3);
const size_t len = luaL_optinteger(L, 4, SHA_DIGEST_LENGTH);
luaL_Buffer b;
unsigned char *out = (unsigned char *)luaL_buffinitsize(L, &b, len);
if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, EVP_sha1(), len, out) == 0) {
if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, EVP_sha1(), SHA_DIGEST_LENGTH, out) == 0) {
return luaL_error(L, "PKCS5_PBKDF2_HMAC() failed");
}
luaL_pushresultsize(&b, len);
lua_pushlstring(L, (char *)out, SHA_DIGEST_LENGTH);
return 1;
}
static int Lpbkdf2_sha256(lua_State *L) {
unsigned char out[SHA256_DIGEST_LENGTH];
size_t pass_len, salt_len;
const char *pass = luaL_checklstring(L, 1, &pass_len);
const unsigned char *salt = (unsigned char *)luaL_checklstring(L, 2, &salt_len);
const int iter = luaL_checkinteger(L, 3);
const int len = luaL_optinteger(L, 4, SHA256_DIGEST_LENGTH);
luaL_Buffer b;
unsigned char *out = (unsigned char *)luaL_buffinitsize(L, &b, len);
if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, EVP_sha256(), len, out) == 0) {
if(PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, EVP_sha256(), SHA256_DIGEST_LENGTH, out) == 0) {
return luaL_error(L, "PKCS5_PBKDF2_HMAC() failed");
}
luaL_pushresultsize(&b, len);
lua_pushlstring(L, (char *)out, SHA_DIGEST_LENGTH);
return 1;
}