bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libalpm/signing.c: Fix calculation of packet size in parse_subpacket

Browse source 
Given RFC 4880 provides the code to do this calculation, I am not sure
how I managed to stuff that up!  This bug was only exposed when a
signature made with "include-key-block" was added to the Arch repos,
which provided a subpacket with the required size to hit this issue.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2020-05-20 14:17:11 +10:00
parent 23b50d60e3
commit 5f6ef895b1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libalpm/signing.c
View file

@ -1058,7 +1058,7 @@ static int parse_subpacket(alpm_handle_t *handle, const char *identifier,
if(length_check(len, spos, 2, handle, identifier) != 0){ if(length_check(len, spos, 2, handle, identifier) != 0){
return -1; return -1;
} }
slen = (sig[spos] << 8) | sig[spos + 1]; slen = ((sig[spos] - 192) << 8) + sig[spos + 1] + 192;
spos = spos + 2; spos = spos + 2;
} else { } else {
if(length_check(len, spos, 5, handle, identifier) != 0) { if(length_check(len, spos, 5, handle, identifier) != 0) {