projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "arm64: dts: rk3399-sapphire: add vbus-5v gpio control in fusb302 node."
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
gcm.c
diff --git
a/crypto/gcm.c
b/crypto/gcm.c
index bec329b3de8d7f2e51ed3bf2d91afcdbe4678e8d..1238b3c5a321984c0414dc283bf9891764762e6a 100644
(file)
--- a/
crypto/gcm.c
+++ b/
crypto/gcm.c
@@
-117,7
+117,7
@@
static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
struct crypto_ablkcipher *ctr = ctx->ctr;
struct {
be128 hash;
struct crypto_ablkcipher *ctr = ctx->ctr;
struct {
be128 hash;
- u8 iv[
8
];
+ u8 iv[
16
];
struct crypto_gcm_setkey_result result;
struct crypto_gcm_setkey_result result;
@@
-639,7
+639,9
@@
static int crypto_gcm_create_common(struct crypto_template *tmpl,
ghash_alg = crypto_find_alg(ghash_name, &crypto_ahash_type,
CRYPTO_ALG_TYPE_HASH,
ghash_alg = crypto_find_alg(ghash_name, &crypto_ahash_type,
CRYPTO_ALG_TYPE_HASH,
- CRYPTO_ALG_TYPE_AHASH_MASK);
+ CRYPTO_ALG_TYPE_AHASH_MASK |
+ crypto_requires_sync(algt->type,
+ algt->mask));
if (IS_ERR(ghash_alg))
return PTR_ERR(ghash_alg);
if (IS_ERR(ghash_alg))
return PTR_ERR(ghash_alg);