On Thu, Aug 21, 2025 at 06:40:32PM +0300, Vladimir 'phcoder' Serbinenko wrote:
> >
> >
>
> Few comments, otherwise looks good
> >
> >>
> >>
> >> Signed-off-by: Gary Lin <[email protected]>
> >> ---
> >> util/import_gcry.py | 28 ++++++++++++++++++++++++++--
> >> 1 file changed, 26 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/util/import_gcry.py b/util/import_gcry.py
> >> index 086bde77c..5b24e4041 100644
> >> --- a/util/import_gcry.py
> >> +++ b/util/import_gcry.py
> >> @@ -146,7 +146,7 @@ with codecs.open (os.path.join (cipher_dir_out,
> >> "crypto.lst"), "w", "utf-8") as
> >> chlog = "%s%s: Removed\n" % (chlog, chlognew)
> >> continue
> >> # TODO: Support KDF
> >>
> > Please update the comment
> >
Ok, I'll update the comment as "TODO: Support scrypt KDF"
> >> - if re.match (r"(kdf\.c|scrypt\.c)$", cipher_file):
> >> + if re.match (r"(scrypt\.c)$", cipher_file):
> >> chlog = "%s%s: Removed\n" % (chlog, chlognew)
> >> continue
> >> # TODO: Support chacha20 and poly1305
> >> @@ -313,6 +313,16 @@ with codecs.open (os.path.join (cipher_dir_out,
> >> "crypto.lst"), "w", "utf-8") as
> >> chlognew = "%s %s" % (chlognew, chmsg)
> >> nch = True
> >> continue
> >> + elif re.match
> >> ("_gcry_kdf_selftest|check_one|_gcry_kdf_pkdf2|_gcry_kdf_derive|openpgp_s2k|ballon_context_size|balloon_*|prng_aes_*|onestep_kdf_*|hkdf_*|x963_kdf_*",
> >> line) is not None and cipher_file == "kdf.c":
> >>
> > Here should be a new Todo for supporting other KDF.
Sure. Will add a TODO here.
Gary Lin
> >
> > + skip = 1
> >> + fname = re.match ("[a-zA-Z0-9_]*",
> >> line).group ()
> >> + chmsg = "(%s): Removed." % fname
> >> + if nch:
> >> + chlognew = "%s\n %s" % (chlognew,
> >> chmsg)
> >> + else:
> >> + chlognew = "%s %s" % (chlognew, chmsg)
> >> + nch = True
> >> + continue
> >> else:
> >> fw.write (holdline)
> >> m = re.match ("# *include <(.*)>", line)
> >> @@ -439,7 +449,7 @@ with codecs.open (os.path.join (cipher_dir_out,
> >> "crypto.lst"), "w", "utf-8") as
> >> nch = True
> >> continue
> >>
> >> - m = re.match (r"((static )?const char( |)\*|static
> >> const gcry_md_spec_t \*|(static )?gpg_err_code_t|gpg_error_t|void|(static
> >> )?int|(static )?unsigned int|(static )?gcry_err_code_t|static
> >> gcry_mpi_t|static void|void|static elliptic_curve_t) *$", line)
> >> + m = re.match (r"((static )?const char( |)\*|static
> >> const gcry_md_spec_t \*|(static )?gpg_err_code_t|gpg_error_t|void|(static
> >> )?int|(static )?unsigned int|(static )?gcry_err_code_t|static
> >> gcry_mpi_t|static void|void|static elliptic_curve_t|static u64|static
> >> size_t) *$", line)
> >> if not m is None:
> >> hold = True
> >> holdline = line
> >> @@ -575,6 +585,20 @@ with codecs.open (os.path.join (cipher_dir_out,
> >> "crypto.lst"), "w", "utf-8") as
> >> conf.write ("};\n\n")
> >> if nch:
> >> chlog = "%s%s\n" % (chlog, chlognew)
> >> + elif cipher_file == "kdf.c":
> >> + modfiles = ["kdf.c"]
> >> + if modname in extra_files:
> >> + modfiles += extra_files[modname]
> >> + conf.write ("module = {\n")
> >> + conf.write (" name = %s;\n" % modname)
> >> + for src in modfiles:
> >> + conf.write (" common =
> >> lib/libgcrypt-grub/cipher/%s;\n" % src)
> >> + confutil.write (" common =
> >> grub-core/lib/libgcrypt-grub/cipher/%s;\n" % src)
> >> + conf.write (" cflags = '$(CFLAGS_GCRY)';\n")
> >> + conf.write (" cppflags = '$(CPPFLAGS_GCRY)';\n")
> >> + conf.write ("};\n\n")
> >> + if nch:
> >> + chlog = "%s%s\n" % (chlog, chlognew)
> >> elif isc and cipher_file not in extra_files_list:
> >> print ("WARNING: C file isn't a module: %s" %
> >> cipher_file)
> >> os.remove (outfile)
> >> --
> >> 2.43.0
> >>
> >> Regards
> > Vladimir 'phcoder' Serbinenko
> >
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
