X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fgss%2Fgss_sk_mech.c;h=5877726cb8263a83c78837737f61905faedf0847;hp=9fab35a61b4b537af0354ff88dc29214f26f92f7;hb=553d93361d2db4ff39bf19ac66dc2d79f6e3e324;hpb=2496089a0017f5b0ff94a7a7994f4c62c8f30d94;ds=sidebyside

diff --git a/lustre/ptlrpc/gss/gss_sk_mech.c b/lustre/ptlrpc/gss/gss_sk_mech.c
index 9fab35a..5877726 100644
--- a/lustre/ptlrpc/gss/gss_sk_mech.c
+++ b/lustre/ptlrpc/gss/gss_sk_mech.c
@@ -318,18 +318,18 @@ u32 sk_make_hmac(enum cfs_crypto_hash_alg algo, rawobj_t *key, int msg_count,
 		 rawobj_t *msgs, int iov_count, lnet_kiov_t *iovs,
 		 rawobj_t *token)
 {
-	struct cfs_crypto_hash_desc *desc;
+	struct ahash_request *req;
 	int rc2, rc;
 
-	desc = cfs_crypto_hash_init(algo, key->data, key->len);
-	if (IS_ERR(desc)) {
-		rc = PTR_ERR(desc);
+	req = cfs_crypto_hash_init(algo, key->data, key->len);
+	if (IS_ERR(req)) {
+		rc = PTR_ERR(req);
 		goto out_init_failed;
 	}
 
-	rc2 = gss_digest_hash(desc, NULL, msg_count, msgs, iov_count, iovs,
+	rc2 = gss_digest_hash(req, NULL, msg_count, msgs, iov_count, iovs,
 			      token);
-	rc = cfs_crypto_hash_final(desc, key->data, &key->len);
+	rc = cfs_crypto_hash_final(req, key->data, &key->len);
 	if (!rc && rc2)
 		rc = rc2;
 out_init_failed:
@@ -399,7 +399,6 @@ u32 sk_verify_bulk_hmac(enum cfs_crypto_hash_alg sc_hmac, rawobj_t *key,
 			int msgcnt, rawobj_t *msgs, int iovcnt,
 			lnet_kiov_t *iovs, int iov_bytes, rawobj_t *token)
 {
-	struct cfs_crypto_hash_desc *desc;
 	rawobj_t checksum = RAWOBJ_EMPTY;
 	struct ahash_request *req;
 	struct scatterlist sg[1];
@@ -419,11 +418,10 @@ u32 sk_verify_bulk_hmac(enum cfs_crypto_hash_alg sc_hmac, rawobj_t *key,
 	if (!checksum.data)
 		return rc;
 
-	desc = cfs_crypto_hash_init(sc_hmac, key->data, key->len);
-	if (IS_ERR(desc))
+	req = cfs_crypto_hash_init(sc_hmac, key->data, key->len);
+	if (IS_ERR(req))
 		goto cleanup;
 
-	req = (struct ahash_request *) desc;
 	for (i = 0; i < msgcnt; i++) {
 		if (!msgs[i].len)
 			continue;
@@ -466,7 +464,7 @@ u32 sk_verify_bulk_hmac(enum cfs_crypto_hash_alg sc_hmac, rawobj_t *key,
 	rc = GSS_S_COMPLETE;
 
 hash_cleanup:
-	cfs_crypto_hash_final(desc, checksum.data, &checksum.len);
+	cfs_crypto_hash_final(req, checksum.data, &checksum.len);
 
 cleanup:
 	OBD_FREE_LARGE(checksum.data, checksum.len);