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

* grub-core/lib/crypto.c (grub_crypto_hash): Remove variable length

Browse source 
array.
This commit is contained in:
Vladimir Serbinenko 2013-11-20 20:09:18 +01:00
parent ca120e31f2
commit 7dd0a30361
4 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/crypto.c (grub_crypto_hash): Remove variable length
array.
2013-11-20 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-20 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkconfig.in: Say explicit "grub configuration" rather * util/grub-mkconfig.in: Say explicit "grub configuration" rather

5
grub-core/lib/crypto.c
View file

@ -125,7 +125,10 @@ void
grub_crypto_hash (const gcry_md_spec_t *hash, void *out, const void *in, grub_crypto_hash (const gcry_md_spec_t *hash, void *out, const void *in,
grub_size_t inlen) grub_size_t inlen)
{ {
grub_uint8_t ctx[hash->contextsize]; GRUB_PROPERLY_ALIGNED_ARRAY (ctx, GRUB_CRYPTO_MAX_MD_CONTEXT_SIZE);
if (hash->contextsize > sizeof (ctx))
grub_fatal ("Too large md context");
hash->init (&ctx); hash->init (&ctx);
hash->write (&ctx, in, inlen); hash->write (&ctx, in, inlen);
hash->final (&ctx); hash->final (&ctx);

1
include/grub/crypto.h
View file

@ -88,6 +88,7 @@ enum gcry_cipher_modes
/* Don't rely on this. Check! */ /* Don't rely on this. Check! */
#define GRUB_CRYPTO_MAX_MDLEN 64 #define GRUB_CRYPTO_MAX_MDLEN 64
#define GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE 16 #define GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE 16
#define GRUB_CRYPTO_MAX_MD_CONTEXT_SIZE 256
/* Type for the cipher_setkey function. */ /* Type for the cipher_setkey function. */
typedef gcry_err_code_t (*gcry_cipher_setkey_t) (void *c, typedef gcry_err_code_t (*gcry_cipher_setkey_t) (void *c,

11
util/import_gcry.py
View file

@ -137,11 +137,13 @@ for cipher_file in cipher_files:
ciphernames = [] ciphernames = []
mdnames = [] mdnames = []
mdctxsizes = []
pknames = [] pknames = []
hold = False hold = False
skip = 0 skip = 0
skip2 = False skip2 = False
ismd = False ismd = False
mdarg = 0
ispk = False ispk = False
iscipher = False iscipher = False
iscryptostart = False iscryptostart = False
@ -174,6 +176,11 @@ for cipher_file in cipher_files:
sg = s.groups()[0] sg = s.groups()[0]
cryptolist.write (("%s: %s\n") % (sg, modname)) cryptolist.write (("%s: %s\n") % (sg, modname))
iscryptostart = False iscryptostart = False
if ismd:
spl = line.split (",")
if mdarg + len (spl) > 9 and mdarg <= 9 and ("sizeof" in spl[9-mdarg]):
mdctxsizes.append (spl[9-mdarg].lstrip ().rstrip())
mdarg = mdarg + len (spl) - 1
if ismd or iscipher or ispk: if ismd or iscipher or ispk:
if not re.search (" *};", line) is None: if not re.search (" *};", line) is None:
if not iscomma: if not iscomma:
@ -189,6 +196,7 @@ for cipher_file in cipher_files:
fw.write (" .blocksize = %s\n" fw.write (" .blocksize = %s\n"
% mdblocksizes [mdname]) % mdblocksizes [mdname])
ismd = False ismd = False
mdarg = 0
iscipher = False iscipher = False
ispk = False ispk = False
iscomma = not re.search (",$", line) is None iscomma = not re.search (",$", line) is None
@ -283,6 +291,7 @@ for cipher_file in cipher_files:
mdname = re.match("[a-zA-Z0-9_]*",mdname).group () mdname = re.match("[a-zA-Z0-9_]*",mdname).group ()
mdnames.append (mdname) mdnames.append (mdname)
ismd = True ismd = True
mdarg = 0
iscryptostart = True iscryptostart = True
m = re.match ("static const char \*selftest.*;$", line) m = re.match ("static const char \*selftest.*;$", line)
if not m is None: if not m is None:
@ -423,6 +432,8 @@ for cipher_file in cipher_files:
chmsg = "Register cipher %s" % ciphername chmsg = "Register cipher %s" % ciphername
chlognew = "%s\n %s" % (chlognew, chmsg) chlognew = "%s\n %s" % (chlognew, chmsg)
fw.write (" grub_cipher_register (&%s);\n" % ciphername) fw.write (" grub_cipher_register (&%s);\n" % ciphername)
for ctxsize in mdctxsizes:
fw.write (" COMPILE_TIME_ASSERT(%s <= GRUB_CRYPTO_MAX_MD_CONTEXT_SIZE);\n" % ctxsize)
for mdname in mdnames: for mdname in mdnames:
chmsg = "Register digest %s" % mdname chmsg = "Register digest %s" % mdname
chlognew = "%s\n %s" % (chlognew, chmsg) chlognew = "%s\n %s" % (chlognew, chmsg)