diff options
| author | Sven Schmidt <4sschmid@informatik.uni-hamburg.de> | 2017-02-24 15:01:19 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 11:00:22 +0200 |
| commit | 1dbe465a8bf32666f202f62d8e3bbc260190f962 (patch) | |
| tree | 34f2475c6a1d65e797b1ab7d20c973223a6fa3cf /crypto | |
| parent | f8f5d2a6c2c489e722a35b8914fed0cd90a2ad92 (diff) | |
[SQUASH] crypto: change LZ4 modules to work with new LZ4 module version
Update the crypto modules using LZ4 compression as well as the test
cases in testmgr.h to work with the new LZ4 module version.
Link: http://lkml.kernel.org/r/1486321748-19085-4-git-send-email-4sschmid@informatik.uni-hamburg.de
Signed-off-by: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
Cc: Bongkyu Kim <bongkyu.kim@lge.com>
Cc: Rui Salvaterra <rsalvaterra@gmail.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Colin Cross <ccross@android.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/lz4.c | 23 | ||||
| -rw-r--r-- | crypto/lz4hc.c | 23 |
2 files changed, 18 insertions, 28 deletions
diff --git a/crypto/lz4.c b/crypto/lz4.c index 34d072b72..bf56b31bb 100644 --- a/crypto/lz4.c +++ b/crypto/lz4.c @@ -49,31 +49,26 @@ static int lz4_compress_crypto(struct crypto_tfm *tfm, const u8 *src, unsigned int slen, u8 *dst, unsigned int *dlen) { struct lz4_ctx *ctx = crypto_tfm_ctx(tfm); - size_t tmp_len = *dlen; - int err; + int out_len = LZ4_compress_default(src, dst, + slen, *dlen, ctx->lz4_comp_mem); - err = lz4_compress(src, slen, dst, &tmp_len, ctx->lz4_comp_mem); - - if (err < 0) + if (!out_len) return -EINVAL; - *dlen = tmp_len; + *dlen = out_len; return 0; } static int lz4_decompress_crypto(struct crypto_tfm *tfm, const u8 *src, unsigned int slen, u8 *dst, unsigned int *dlen) { - int err; - size_t tmp_len = *dlen; - size_t __slen = slen; + int out_len = LZ4_decompress_safe(src, dst, slen, *dlen); - err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len); - if (err < 0) - return -EINVAL; + if (out_len < 0) + return out_len; - *dlen = tmp_len; - return err; + *dlen = out_len; + return 0; } static struct crypto_alg alg_lz4 = { diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c index 9218b3fed..36fd60093 100644 --- a/crypto/lz4hc.c +++ b/crypto/lz4hc.c @@ -49,31 +49,26 @@ static int lz4hc_compress_crypto(struct crypto_tfm *tfm, const u8 *src, unsigned int slen, u8 *dst, unsigned int *dlen) { struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm); - size_t tmp_len = *dlen; - int err; + int out_len = LZ4_compress_HC(src, dst, slen, + *dlen, LZ4HC_DEFAULT_CLEVEL, ctx->lz4hc_comp_mem); - err = lz4hc_compress(src, slen, dst, &tmp_len, ctx->lz4hc_comp_mem); - - if (err < 0) + if (!out_len) return -EINVAL; - *dlen = tmp_len; + *dlen = out_len; return 0; } static int lz4hc_decompress_crypto(struct crypto_tfm *tfm, const u8 *src, unsigned int slen, u8 *dst, unsigned int *dlen) { - int err; - size_t tmp_len = *dlen; - size_t __slen = slen; + int out_len = LZ4_decompress_safe(src, dst, slen, *dlen); - err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len); - if (err < 0) - return -EINVAL; + if (out_len < 0) + return out_len; - *dlen = tmp_len; - return err; + *dlen = out_len; + return 0; } static struct crypto_alg alg_lz4hc = { |