diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-09-26 15:54:31 +0200 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-09-26 15:54:31 +0200 |
commit | 50d4fb1dc129955ab571c1dd7bf14cd07cc5984d (patch) | |
tree | e7667ecbd53d3985d294ea7ee64e33f9523cedff /crypto/wp512.c | |
parent | 4ac44d603f290242cbba2e0d0383460412d55c04 (diff) | |
parent | a41bb691f04fcf6d3fa1f6e743d1520e305bc71d (diff) | |
download | linux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.tar.gz linux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.zip |
Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Sync with upstream (which now contains fbdev-v4.19 changes) to
prepare a base for fbdev-v4.20 changes.
Diffstat (limited to 'crypto/wp512.c')
-rw-r--r-- | crypto/wp512.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/wp512.c b/crypto/wp512.c index 7ee5a043..149e577f 100644 --- a/crypto/wp512.c +++ b/crypto/wp512.c @@ -1127,7 +1127,6 @@ static struct shash_alg wp_algs[3] = { { .descsize = sizeof(struct wp512_ctx), .base = { .cra_name = "wp512", - .cra_flags = CRYPTO_ALG_TYPE_SHASH, .cra_blocksize = WP512_BLOCK_SIZE, .cra_module = THIS_MODULE, } @@ -1139,7 +1138,6 @@ static struct shash_alg wp_algs[3] = { { .descsize = sizeof(struct wp512_ctx), .base = { .cra_name = "wp384", - .cra_flags = CRYPTO_ALG_TYPE_SHASH, .cra_blocksize = WP512_BLOCK_SIZE, .cra_module = THIS_MODULE, } @@ -1151,7 +1149,6 @@ static struct shash_alg wp_algs[3] = { { .descsize = sizeof(struct wp512_ctx), .base = { .cra_name = "wp256", - .cra_flags = CRYPTO_ALG_TYPE_SHASH, .cra_blocksize = WP512_BLOCK_SIZE, .cra_module = THIS_MODULE, } |