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.crypto, util.jwt: Generate consistent signature sizes (via padding)

Browse source 
This fixes the signature parsing and building to work correctly. Sometimes
a signature was one or two bytes too short, and needed to be padded. OpenSSL
can do this for us.
This commit is contained in:
Matthew Wild 2022-09-29 23:15:39 +01:00
parent dfd1e396bb
commit 8695a72a66
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
util-src/crypto.c
View file

@ -33,6 +33,9 @@ typedef unsigned __int32 uint32_t;
#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R) #define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
#endif #endif
/* The max size of an encoded 'R' or 'S' value. P-521 = 521 bits = 66 bytes */
#define MAX_ECDSA_SIG_INT_BYTES 66
#include "managed_pointer.h" #include "managed_pointer.h"
#define PKEY_MT_TAG "util.crypto key" #define PKEY_MT_TAG "util.crypto key"
@ -433,10 +436,15 @@ static int Lparse_ecdsa_signature(lua_State *L) {
ECDSA_SIG *sig; ECDSA_SIG *sig;
size_t sig_der_len; size_t sig_der_len;
const unsigned char *sig_der = (unsigned char*)luaL_checklstring(L, 1, &sig_der_len); const unsigned char *sig_der = (unsigned char*)luaL_checklstring(L, 1, &sig_der_len);
const size_t sig_int_bytes = luaL_checkinteger(L, 2);
const BIGNUM *r, *s; const BIGNUM *r, *s;
unsigned char rb[32];
unsigned char sb[32];
int rlen, slen; int rlen, slen;
unsigned char rb[MAX_ECDSA_SIG_INT_BYTES];
unsigned char sb[MAX_ECDSA_SIG_INT_BYTES];
if(sig_int_bytes > MAX_ECDSA_SIG_INT_BYTES) {
luaL_error(L, "requested signature size exceeds supported limit");
}
sig = d2i_ECDSA_SIG(NULL, &sig_der, sig_der_len); sig = d2i_ECDSA_SIG(NULL, &sig_der, sig_der_len);
@ -447,17 +455,14 @@ static int Lparse_ecdsa_signature(lua_State *L) {
ECDSA_SIG_get0(sig, &r, &s); ECDSA_SIG_get0(sig, &r, &s);
rlen = BN_num_bytes(r); rlen = BN_bn2binpad(r, rb, sig_int_bytes);
slen = BN_num_bytes(s); slen = BN_bn2binpad(s, sb, sig_int_bytes);
if (rlen > 32 || slen > 32) { if (rlen == -1 || slen == -1) {
ECDSA_SIG_free(sig); ECDSA_SIG_free(sig);
luaL_error(L, "unexpectedly large signature integers"); luaL_error(L, "encoded integers exceed requested size");
} }
BN_bn2bin(r, rb);
BN_bn2bin(s, sb);
ECDSA_SIG_free(sig); ECDSA_SIG_free(sig);
lua_pushlstring(L, (const char*)rb, rlen); lua_pushlstring(L, (const char*)rb, rlen);
@ -485,7 +490,9 @@ static int Lbuild_ecdsa_signature(lua_State *L) {
luaL_buffinit(L, &sigbuf); luaL_buffinit(L, &sigbuf);
unsigned char *buffer = (unsigned char*)luaL_prepbuffsize(&sigbuf, rlen+slen+32); /* DER structure of an ECDSA signature has 7 bytes plus the integers themselves,
which may gain an extra byte once encoded */
unsigned char *buffer = (unsigned char*)luaL_prepbuffsize(&sigbuf, (rlen+1)+(slen+1)+7);
int len = i2d_ECDSA_SIG(sig, &buffer); int len = i2d_ECDSA_SIG(sig, &buffer);
luaL_addsize(&sigbuf, len); luaL_addsize(&sigbuf, len);
luaL_pushresult(&sigbuf); luaL_pushresult(&sigbuf);

8
util/jwt.lua
View file

@ -135,21 +135,21 @@ local function new_rsa_algorithm(name)
end end
-- ES*** -- ES***
local function new_ecdsa_algorithm(name, c_sign, c_verify) local function new_ecdsa_algorithm(name, c_sign, c_verify, sig_bytes)
local function encode_ecdsa_sig(der_sig) local function encode_ecdsa_sig(der_sig)
local r, s = crypto.parse_ecdsa_signature(der_sig); local r, s = crypto.parse_ecdsa_signature(der_sig, sig_bytes);
return r..s; return r..s;
end end
local function decode_ecdsa_sig(jwk_sig) local function decode_ecdsa_sig(jwk_sig)
return crypto.build_ecdsa_signature(jwk_sig:sub(1, 32), jwk_sig:sub(33, 64)); return crypto.build_ecdsa_signature(jwk_sig:sub(1, sig_bytes), jwk_sig:sub(sig_bytes+1, sig_bytes*2));
end end
return new_crypto_algorithm(name, "id-ecPublicKey", c_sign, c_verify, encode_ecdsa_sig, decode_ecdsa_sig); return new_crypto_algorithm(name, "id-ecPublicKey", c_sign, c_verify, encode_ecdsa_sig, decode_ecdsa_sig);
end end
local algorithms = { local algorithms = {
HS256 = new_hmac_algorithm("HS256"), HS384 = new_hmac_algorithm("HS384"), HS512 = new_hmac_algorithm("HS512"); HS256 = new_hmac_algorithm("HS256"), HS384 = new_hmac_algorithm("HS384"), HS512 = new_hmac_algorithm("HS512");
ES256 = new_ecdsa_algorithm("ES256", crypto.ecdsa_sha256_sign, crypto.ecdsa_sha256_verify); ES256 = new_ecdsa_algorithm("ES256", crypto.ecdsa_sha256_sign, crypto.ecdsa_sha256_verify, 32);
RS256 = new_rsa_algorithm("RS256"), RS384 = new_rsa_algorithm("RS384"), RS512 = new_rsa_algorithm("RS512"); RS256 = new_rsa_algorithm("RS256"), RS384 = new_rsa_algorithm("RS384"), RS512 = new_rsa_algorithm("RS512");
PS256 = new_rsa_algorithm("PS256"), PS384 = new_rsa_algorithm("PS384"), PS512 = new_rsa_algorithm("PS512"); PS256 = new_rsa_algorithm("PS256"), PS384 = new_rsa_algorithm("PS384"), PS512 = new_rsa_algorithm("PS512");
}; };