File _service:obs_scm:0010-uadk-digest-add-partial_b... of Package libwd

File _service:obs_scm:0010-uadk-digest-add-partial_block-to-store-partial-data.patch of Package libwd

From 6ad149cab59176faf05e65233b4986916a1f7c8d Mon Sep 17 00:00:00 2001
From: Weili Qian <qianweili@huawei.com>
Date: Mon, 5 Feb 2024 17:27:07 +0800
Subject: [PATCH 10/44] uadk/digest: add partial_block to store partial data

For the long hash first blcok and middle block, if the size of
the data is not aligned with the block size, the partial data is
stored in partial_block and combined with the next block to form
an aligned length for calculation. Currently, partial_block is
added to struct wd_digest_sess to store partial data.

Signed-off-by: Weili Qian <qianweili@huawei.com>
---
 include/drv/wd_digest_drv.h |  4 +++
 wd_digest.c                 | 50 ++++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/include/drv/wd_digest_drv.h b/include/drv/wd_digest_drv.h
index 304b506..8a4aa0b 100644
--- a/include/drv/wd_digest_drv.h
+++ b/include/drv/wd_digest_drv.h
@@ -44,6 +44,8 @@ struct wd_digest_msg {
 	__u32 in_bytes;
 	/* out_bytes */
 	__u32 out_bytes;
+	/* partial bytes for stream mode */
+	__u32 partial_bytes;
 
 	/* input key pointer */
 	__u8 *key;
@@ -53,6 +55,8 @@ struct wd_digest_msg {
 	__u8 *in;
 	/* output data pointer */
 	__u8 *out;
+	/* partial pointer for stream mode */
+	__u8 *partial_block;
 	/* total of data for stream mode */
 	__u64 long_data_len;
 };
diff --git a/wd_digest.c b/wd_digest.c
index acf341a..dba2f95 100644
--- a/wd_digest.c
+++ b/wd_digest.c
@@ -11,6 +11,7 @@
 #include "wd_digest.h"
 
 #define GMAC_IV_LEN		16
+#define MAX_BLOCK_SIZE		128
 
 static __u32 g_digest_mac_len[WD_DIGEST_TYPE_MAX] = {
 	WD_DIGEST_SM3_LEN, WD_DIGEST_MD5_LEN, WD_DIGEST_SHA1_LEN,
@@ -45,6 +46,19 @@ struct wd_digest_setting {
 	void *dlh_list;
 } wd_digest_setting;
 
+struct wd_digest_stream_data {
+	/* Long hash mode, first and middle block misaligned data */
+	unsigned char partial_block[MAX_BLOCK_SIZE];
+	__u32 partial_bytes;
+	/* Total data length for stream mode */
+	__u64 long_data_len;
+	/*
+	 * Notify the stream message state, zero is frist message,
+	 * non-zero is middle or final message.
+	 */
+	int msg_state;
+};
+
 struct wd_digest_sess {
 	char			*alg_name;
 	enum wd_digest_type	alg;
@@ -53,14 +67,7 @@ struct wd_digest_sess {
 	unsigned char		key[MAX_HMAC_KEY_SIZE];
 	__u32			key_bytes;
 	void			*sched_key;
-	/*
-	 * Notify the stream message state, zero is frist message,
-	 * non-zero is middle or final message.
-	 */
-	int			msg_state;
-
-	/* Total data length for stream mode */
-	__u64			long_data_len;
+	struct wd_digest_stream_data stream_data;
 };
 
 struct wd_env_config wd_digest_env_config;
@@ -536,12 +543,12 @@ static void fill_request_msg(struct wd_digest_msg *msg,
 	memcpy(&msg->req, req, sizeof(struct wd_digest_req));
 
 	if (unlikely(req->has_next == WD_DIGEST_STREAM_END)) {
-		sess->long_data_len = req->long_data_len;
-		sess->msg_state = WD_DIGEST_DOING;
+		sess->stream_data.long_data_len = req->long_data_len;
+		sess->stream_data.msg_state = WD_DIGEST_DOING;
 		req->has_next = WD_DIGEST_END;
 	} else if (unlikely(req->has_next == WD_DIGEST_STREAM_DOING)) {
-		sess->long_data_len = req->long_data_len;
-		sess->msg_state = WD_DIGEST_DOING;
+		sess->stream_data.long_data_len = req->long_data_len;
+		sess->stream_data.msg_state = WD_DIGEST_DOING;
 		req->has_next = WD_DIGEST_DOING;
 	}
 
@@ -557,10 +564,12 @@ static void fill_request_msg(struct wd_digest_msg *msg,
 	msg->out_bytes = req->out_bytes;
 	msg->data_fmt = req->data_fmt;
 	msg->has_next = req->has_next;
-	msg->long_data_len = sess->long_data_len + req->in_bytes;
+	msg->long_data_len = sess->stream_data.long_data_len + req->in_bytes;
+	msg->partial_block = sess->stream_data.partial_block;
+	msg->partial_bytes = sess->stream_data.partial_bytes;
 
 	/* Use iv_bytes to store the stream message state */
-	msg->iv_bytes = sess->msg_state;
+	msg->iv_bytes = sess->stream_data.msg_state;
 }
 
 static int send_recv_sync(struct wd_ctx_internal *ctx, struct wd_digest_sess *dsess,
@@ -579,17 +588,22 @@ static int send_recv_sync(struct wd_ctx_internal *ctx, struct wd_digest_sess *ds
 	if (unlikely(ret))
 		return ret;
 
-	/* After a stream mode job was done, update session long_data_len */
+	/*
+	 * After a stream mode job was done, update session
+	 * long_data_len and partial_bytes.
+	 */
 	if (msg->has_next) {
 		/* Long hash(first and middle message) */
-		dsess->long_data_len += msg->in_bytes;
+		dsess->stream_data.long_data_len += msg->in_bytes;
+		dsess->stream_data.partial_bytes = msg->partial_bytes;
 	} else if (msg->iv_bytes) {
 		/* Long hash(final message) */
-		dsess->long_data_len = 0;
+		dsess->stream_data.long_data_len = 0;
+		dsess->stream_data.partial_bytes = 0;
 	}
 
 	/* Update session message state */
-	dsess->msg_state = msg->has_next;
+	dsess->stream_data.msg_state = msg->has_next;
 
 	return 0;
 }
-- 
2.25.1