util/import_gcry: Make compatible with Python 3.4
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
parent
2a6de42093
commit
334353a977
@ -249,15 +249,15 @@ for cipher_file in cipher_files:
|
|||||||
if not re.search (" *};", line) is None:
|
if not re.search (" *};", line) is None:
|
||||||
escapenl = " \\" if ismddefine else ""
|
escapenl = " \\" if ismddefine else ""
|
||||||
if not iscomma:
|
if not iscomma:
|
||||||
fw.write (f" ,{escapenl}\n")
|
fw.write (" ,%s\n" % escapenl)
|
||||||
fw.write (f" GRUB_UTIL_MODNAME(\"%s\"){escapenl}\n" % modname);
|
fw.write (" GRUB_UTIL_MODNAME(\"%s\")%s\n" % (modname, escapenl))
|
||||||
if ismd:
|
if ismd:
|
||||||
if not (mdname in mdblocksizes):
|
if not (mdname in mdblocksizes):
|
||||||
print ("ERROR: Unknown digest blocksize: %s\n"
|
print ("ERROR: Unknown digest blocksize: %s\n"
|
||||||
% mdname)
|
% mdname)
|
||||||
exit (1)
|
exit (1)
|
||||||
fw.write (f" .blocksize = %s{escapenl}\n"
|
fw.write (" .blocksize = %s%s\n"
|
||||||
% mdblocksizes [mdname])
|
% (mdblocksizes [mdname], escapenl))
|
||||||
ismd = False
|
ismd = False
|
||||||
ismddefine = False
|
ismddefine = False
|
||||||
mdarg = 0
|
mdarg = 0
|
||||||
@ -361,7 +361,7 @@ for cipher_file in cipher_files:
|
|||||||
if isc and not m is None:
|
if isc and not m is None:
|
||||||
bs = m.groups()[0]
|
bs = m.groups()[0]
|
||||||
bits = m.groups()[2]
|
bits = m.groups()[2]
|
||||||
mdname = f"_gcry_digest_spec_blake2{bs}_{bits}"
|
mdname = "_gcry_digest_spec_blake2%s_%s" % (bs, bits)
|
||||||
mdnames.append (mdname)
|
mdnames.append (mdname)
|
||||||
|
|
||||||
m = re.match ("(const )?gcry_md_spec_t", line)
|
m = re.match ("(const )?gcry_md_spec_t", line)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user