particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only pad header lengths for signature headers

Browse source 
Based on a workaround by puiterwijk
https://github.com/fedora-iot/rpm-head-signing/pull/61/files
This commit is contained in:
Mike McLean 2023-02-14 17:52:33 -05:00 • committed by Tomas Kopecek
parent 6d80b3b4af
commit c3cd98d152
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
koji/__init__.py
View file

@ -618,11 +618,12 @@ def find_rpm_sighdr(path):
# The lead is a fixed sized section (96 bytes) that is mostly obsolete
sig_start = 96
sigsize = rpm_hdr_size(path, sig_start)
sigsize = rpm_hdr_size(path, sig_start, pad=True)
# "As of RPM 2.1 ... the Signature section is padded to a multiple of 8 bytes"
return (sig_start, sigsize)
def rpm_hdr_size(f, ofs=None):
def rpm_hdr_size(f, ofs=None, pad=False):
"""Returns the length (in bytes) of the rpm header
f = filename or file object
@ -652,8 +653,9 @@ def rpm_hdr_size(f, ofs=None):
# this is what the section data says the size should be
hdrsize = 8 + 16 * il + dl
# hdrsize rounded up to nearest 8 bytes
hdrsize = hdrsize + (8 - (hdrsize % 8)) % 8
if pad:
# signature headers are padded to a multiple of 8 bytes
hdrsize = hdrsize + (8 - (hdrsize % 8)) % 8
# add eight bytes for section header
hdrsize = hdrsize + 8