Commit 31d8f92e authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Eduardo Habkost
Browse files

scripts: ensure signrom treats data as bytes 



Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <20180116134217.8725-10-berrange@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent d4e5ec87

scripts/signrom.py

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ fin = open(sys.argv[1], 'rb') 
fout = open(sys.argv[2], 'wb')



magic = fin.read(2)

if magic != '\x55\xaa':

if magic != b'\x55\xaa':

    sys.exit("%s: option ROM does not begin with magic 55 aa" % sys.argv[1])



size_byte = ord(fin.read(1))
@@ -33,7 +33,7 @@ elif len(data) < size: 
    # Add padding if necessary, rounding the whole input to a multiple of

    # 512 bytes according to the third byte of the input.

    # size-1 because a final byte is added below to store the checksum.

    data = data.ljust(size-1, '\0')

    data = data.ljust(size-1, b'\0')

else:

    if ord(data[-1:]) != 0:

        sys.stderr.write('WARNING: ROM includes nonzero checksum\n')