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
USB: ehci-omap: Fix resume failures after bus suspend
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
authenc.c
diff --git
a/crypto/authenc.c
b/crypto/authenc.c
index 2bb7348d8d5543364b1c75440e9d1c13ad1a0e2c..05eb32e0d9495015f1a7970a079f882d0762a5c7 100644
(file)
--- a/
crypto/authenc.c
+++ b/
crypto/authenc.c
@@
-46,6
+46,12
@@
struct authenc_request_ctx {
char tail[];
};
char tail[];
};
+static void authenc_request_complete(struct aead_request *req, int err)
+{
+ if (err != -EINPROGRESS)
+ aead_request_complete(req, err);
+}
+
static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
unsigned int keylen)
{
static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
unsigned int keylen)
{
@@
-142,7
+148,7
@@
static void authenc_geniv_ahash_update_done(struct crypto_async_request *areq,
crypto_aead_authsize(authenc), 1);
out:
crypto_aead_authsize(authenc), 1);
out:
- a
ead
_request_complete(req, err);
+ a
uthenc
_request_complete(req, err);
}
static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err)
}
static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err)
@@
-208,7
+214,7
@@
static void authenc_verify_ahash_update_done(struct crypto_async_request *areq,
err = crypto_ablkcipher_decrypt(abreq);
out:
err = crypto_ablkcipher_decrypt(abreq);
out:
- a
ead
_request_complete(req, err);
+ a
uthenc
_request_complete(req, err);
}
static void authenc_verify_ahash_done(struct crypto_async_request *areq,
}
static void authenc_verify_ahash_done(struct crypto_async_request *areq,
@@
-245,7
+251,7
@@
static void authenc_verify_ahash_done(struct crypto_async_request *areq,
err = crypto_ablkcipher_decrypt(abreq);
out:
err = crypto_ablkcipher_decrypt(abreq);
out:
- a
ead
_request_complete(req, err);
+ a
uthenc
_request_complete(req, err);
}
static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags)
}
static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags)
@@
-379,7
+385,7
@@
static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
err = crypto_authenc_genicv(areq, iv, 0);
}
err = crypto_authenc_genicv(areq, iv, 0);
}
- a
ead
_request_complete(areq, err);
+ a
uthenc
_request_complete(areq, err);
}
static int crypto_authenc_encrypt(struct aead_request *req)
}
static int crypto_authenc_encrypt(struct aead_request *req)
@@
-420,7
+426,7
@@
static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
err = crypto_authenc_genicv(areq, greq->giv, 0);
}
err = crypto_authenc_genicv(areq, greq->giv, 0);
}
- a
ead
_request_complete(areq, err);
+ a
uthenc
_request_complete(areq, err);
}
static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)
}
static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)