On Sun, 2012-03-25 at 23:11 +0200, Joel Reardon wrote: > Compress and decompress now have an extra u8 *key field, and NULL is > passed wherever it is used. Later this will be used for an encryption key > for the data being compressed/decompressed (and NULL if no cryptographic operations should be done.) > > Signed-off-by: Joel Reardon <reardonj@xxxxxxxxxxx> > > From 650a52b5301778cf2f0c17ed993a104a4473a8fb Mon Sep 17 00:00:00 2001 > From: Joel Reardon <jreardon@fatbottomsworth.(none)> > Date: Sun, 25 Mar 2012 23:06:03 +0200 > Subject: [PATCH] Added a key parameter to de/compress. If I use git-am I will get the above "From" etc stuff in the commit message, which is not what was intended. Just send the 'git format-patch' output "as-is". > > --- > fs/ubifs/compress.c | 8 ++++++-- > fs/ubifs/file.c | 5 +++-- > fs/ubifs/journal.c | 7 ++++--- > fs/ubifs/ubifs.h | 4 ++-- > 4 files changed, 15 insertions(+), 9 deletions(-) > > diff --git a/fs/ubifs/compress.c b/fs/ubifs/compress.c > index 11e4132..d1812fa 100644 > --- a/fs/ubifs/compress.c > +++ b/fs/ubifs/compress.c > @@ -82,6 +82,8 @@ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; > * @out_len: output buffer length is returned here > * @compr_type: type of compression to use on enter, actually used compression > * type on exit > + * @key: a pointer to a key-sized buffer to use as the encryption key. if NULL > + * then no encryption is performed. This is confusing. In UBIFS we already have notion of "key" with established meaning, defined in fs/ubifs/key.h. Would you please use a different term, e.g., "encryption key", "crypto-key", for better readability. The same for the variable name - to avoid ambiguity, use something like 'cryptokey' or at least 'ckey' or something else. Also, the comment says "key-sized" buffer, which is also confusing. Either do not say anything about the size or define it better. -- Best Regards, Artem Bityutskiy
Attachment:
signature.asc
Description: This is a digitally signed message part