From: Eric Biggers <ebiggers3@gmail.com>
To: Michael Halcrow <mhalcrow@google.com>
Cc: David Gstir <david@sigma-star.at>,
tytso@mit.edu, jaegeuk@kernel.org, richard@sigma-star.at,
herbert@gondor.apana.org.au, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-fscrypt@vger.kernel.org,
Daniel Walter <dwalter@sigma-star.at>
Subject: Re: [PATCH v4] fscrypt: Add support for AES-128-CBC
Date: Thu, 15 Jun 2017 13:48:41 -0700 [thread overview]
Message-ID: <20170615204841.GA66403@gmail.com> (raw)
In-Reply-To: <20170615204129.GA23647@google.com>
On Thu, Jun 15, 2017 at 01:41:29PM -0700, Michael Halcrow wrote:
> > static int validate_user_key(struct fscrypt_info *crypt_info,
> > struct fscrypt_context *ctx, u8 *raw_key,
> > - const char *prefix)
> > + const char *prefix, int min_keysize)
> > {
> > char *description;
> > struct key *keyring_key;
> > @@ -111,50 +116,60 @@ static int validate_user_key(struct fscrypt_info *crypt_info,
> > master_key = (struct fscrypt_key *)ukp->data;
> > BUILD_BUG_ON(FS_AES_128_ECB_KEY_SIZE != FS_KEY_DERIVATION_NONCE_SIZE);
> >
> > - if (master_key->size != FS_AES_256_XTS_KEY_SIZE) {
> > + if (master_key->size < min_keysize || master_key->size > FS_MAX_KEY_SIZE
> > + || master_key->size % AES_BLOCK_SIZE != 0) {
>
> I suggest validating the provided key size directly against the mode.
> Else, it looks to me that this code will accept a 128-bit key for
> AES-256.
>
It's doing that already; min_keysize depends on the mode.
Eric
next prev parent reply other threads:[~2017-06-15 20:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 17:38 [PATCH] fscrypt: Add support for AES-128-CBC David Gstir
2017-03-31 6:21 ` Eric Biggers
2017-03-31 6:36 ` Eric Biggers
2017-03-31 11:11 ` David Gstir
2017-04-25 14:41 ` [PATCH v2] " David Gstir
2017-04-25 20:10 ` Eric Biggers
2017-04-26 6:18 ` David Gstir
2017-04-26 21:56 ` Eric Biggers
2017-05-17 11:21 ` [PATCH v3] " David Gstir
2017-05-17 18:08 ` Eric Biggers
2017-05-18 13:43 ` David Gstir
2017-05-23 5:11 ` [PATCH v4] " David Gstir
2017-05-23 19:00 ` Eric Biggers
2017-05-31 15:57 ` David Gstir
2017-06-01 14:25 ` Theodore Ts'o
2017-06-15 20:41 ` Michael Halcrow
2017-06-15 20:48 ` Eric Biggers [this message]
2017-06-16 7:39 ` David Gstir
2017-06-19 7:27 ` [PATCH v5] " David Gstir
2017-06-24 0:09 ` Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170615204841.GA66403@gmail.com \
--to=ebiggers3@gmail.com \
--cc=david@sigma-star.at \
--cc=dwalter@sigma-star.at \
--cc=herbert@gondor.apana.org.au \
--cc=jaegeuk@kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhalcrow@google.com \
--cc=richard@sigma-star.at \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).