vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move include/grub/cipher_wrap.h to lib/libgcrypt_wrap/cipher_wrap.h

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-05 16:33:39 +01:00
parent 84c6b0863f
commit 9d1fafb96e
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/common.rmk
View file

@ -640,5 +640,6 @@ password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
bin_UTILITIES += grub-mkpasswd-pbkdf2 bin_UTILITIES += grub-mkpasswd-pbkdf2
grub_mkpasswd_pbkdf2_SOURCES = util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c grub_mkpasswd_pbkdf2_SOURCES = util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap
include $(srcdir)/conf/gcry.mk include $(srcdir)/conf/gcry.mk

0
include/grub/cipher_wrap.h → lib/libgcrypt_wrap/cipher_wrap.h
View file

23
util/import_gcry.py
View file

@ -67,6 +67,12 @@ for cipher_file in cipher_files:
if cipher_file == "ChangeLog": if cipher_file == "ChangeLog":
continue continue
chlognew = " * %s" % cipher_file chlognew = " * %s" % cipher_file
if re.match ("(Manifest|Makefile\.am|ac\.c|cipher\.c|hash-common\.c|hmac-tests\.c|md\.c|pubkey\.c)$", cipher_file):
chlog = "%s%s: Removed\n" % (chlog, chlognew)
continue
# Autogenerated files. Not even worth mentionning in ChangeLog
if re.match ("Makefile\.in$", cipher_file):
continue
nch = False nch = False
if re.match (".*\.[ch]$", cipher_file): if re.match (".*\.[ch]$", cipher_file):
isc = re.match (".*\.c$", cipher_file) isc = re.match (".*\.c$", cipher_file)
@ -220,7 +226,7 @@ for cipher_file in cipher_files:
conf.write ("pkglib_MODULES += %s.mod\n" % modname) conf.write ("pkglib_MODULES += %s.mod\n" % modname)
conf.write ("%s_mod_SOURCES = %s\n" %\ conf.write ("%s_mod_SOURCES = %s\n" %\
(modname, modfiles)) (modname, modfiles))
conf.write ("%s_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-missing-field-initializers -Wno-error\n" % modname) conf.write ("%s_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap\n" % modname)
conf.write ("%s_mod_LDFLAGS = $(COMMON_LDFLAGS)\n\n" % modname) conf.write ("%s_mod_LDFLAGS = $(COMMON_LDFLAGS)\n\n" % modname)
elif isc and cipher_file != "camellia.c": elif isc and cipher_file != "camellia.c":
print ("WARNING: C file isn't a module: %s" % cipher_file) print ("WARNING: C file isn't a module: %s" % cipher_file)
@ -229,26 +235,19 @@ for cipher_file in cipher_files:
if nch: if nch:
chlog = "%s%s\n" % (chlog, chlognew) chlog = "%s%s\n" % (chlog, chlognew)
continue continue
if re.match ("(Manifest|Makefile\.am)$", cipher_file):
chlog = "%s%sRemoved\n" % (chlog, chlognew)
continue
# Autogenerated files. Not even worth mentionning in ChangeLog
if re.match ("Makefile\.in$", cipher_file):
chlog = "%s%sRemoved\n" % (chlog, chlognew)
continue
chlog = "%s%sSkipped unknown file\n" % (chlog, chlognew) chlog = "%s%sSkipped unknown file\n" % (chlog, chlognew)
print ("WARNING: unknown file %s" % cipher_file) print ("WARNING: unknown file %s" % cipher_file)
outfile = os.path.join (cipher_dir_out, "types.h") outfile = os.path.join (cipher_dir_out, "types.h")
fw=open (outfile, "w") fw=open (outfile, "w")
fw.write ("#include <grub/types.h>\n") fw.write ("#include <grub/types.h>\n")
fw.write ("#include <grub/cipher_wrap.h>\n") fw.write ("#include <cipher_wrap.h>\n")
chlog = "%s * types.h: New file.\n" % chlog chlog = "%s * types.h: New file.\n" % chlog
fw.close () fw.close ()
outfile = os.path.join (cipher_dir_out, "memory.h") outfile = os.path.join (cipher_dir_out, "memory.h")
fw=open (outfile, "w") fw=open (outfile, "w")
fw.write ("#include <grub/cipher_wrap.h>\n") fw.write ("#include <cipher_wrap.h>\n")
chlog = "%s * memory.h: New file.\n" % chlog chlog = "%s * memory.h: New file.\n" % chlog
fw.close () fw.close ()
@ -256,13 +255,13 @@ fw.close ()
outfile = os.path.join (cipher_dir_out, "cipher.h") outfile = os.path.join (cipher_dir_out, "cipher.h")
fw=open (outfile, "w") fw=open (outfile, "w")
fw.write ("#include <grub/crypto.h>\n") fw.write ("#include <grub/crypto.h>\n")
fw.write ("#include <grub/cipher_wrap.h>\n") fw.write ("#include <cipher_wrap.h>\n")
chlog = "%s * cipher.h: Likewise.\n" % chlog chlog = "%s * cipher.h: Likewise.\n" % chlog
fw.close () fw.close ()
outfile = os.path.join (cipher_dir_out, "g10lib.h") outfile = os.path.join (cipher_dir_out, "g10lib.h")
fw=open (outfile, "w") fw=open (outfile, "w")
fw.write ("#include <grub/cipher_wrap.h>\n") fw.write ("#include <cipher_wrap.h>\n")
chlog = "%s * g10lib.h: Likewise.\n" % chlog chlog = "%s * g10lib.h: Likewise.\n" % chlog
fw.close () fw.close ()