Rename mgf_digest_size to mgf_size to fix checkpatch warnings

Reformatting these function calls will always result in checkpatch warnings unless the variable names are shorter or the calls is refactored to a separate function. Shortening the name is simpler. Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
OP-TEE · Apr 5, 2024 · d66d728 · d66d728
1 parent 14fc4f1
commit d66d728
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/core/drivers/crypto/caam/acipher/caam_rsa.c b/core/drivers/crypto/caam/acipher/caam_rsa.c
@@ -891,7 +891,7 @@ static TEE_Result do_oaep_decoding(struct drvcrypt_rsa_ed *rsa_data)
 	 * Note: Use same buffer for seed and seedMask
 	 */
 	mgf_data.hash_algo = rsa_data->mgf_algo;
-	mgf_data.digest_size = rsa_data->mgf_digest_size;
+	mgf_data.digest_size = rsa_data->mgf_size;
 	mgf_data.seed.data = maskedDB.data;
 	mgf_data.seed.length = maskedDB.length;
 	mgf_data.mask.data = seed.data;
@@ -1124,7 +1124,7 @@ static TEE_Result do_oaep_encoding(struct drvcrypt_rsa_ed *rsa_data)
 	 * dbMask = MGF(seed, k - hLen - 1)
 	 */
 	mgf_data.hash_algo = rsa_data->mgf_algo;
-	mgf_data.digest_size = rsa_data->mgf_digest_size;
+	mgf_data.digest_size = rsa_data->mgf_size;
 	mgf_data.seed.data = seed.data;
 	mgf_data.seed.length = seed.length;
 	mgf_data.mask.data = dbMask.data;

diff --git a/core/drivers/crypto/crypto_api/acipher/rsa.c b/core/drivers/crypto/crypto_api/acipher/rsa.c
@@ -233,9 +233,8 @@ TEE_Result crypto_acipher_rsaes_decrypt(uint32_t algo, struct rsa_keypair *key,
 				return ret;
 
 			rsa_data.mgf_algo = mgf_algo;
-			ret = tee_alg_get_digest_size(
-					rsa_data.mgf_algo,
-					&rsa_data.mgf_digest_size);
+			ret = tee_alg_get_digest_size(rsa_data.mgf_algo,
+						      &rsa_data.mgf_size);
 			if (ret != TEE_SUCCESS)
 				return ret;
 
@@ -332,9 +331,8 @@ TEE_Result crypto_acipher_rsaes_encrypt(uint32_t algo,
 				return TEE_ERROR_BAD_PARAMETERS;
 
 			rsa_data.mgf_algo = mgf_algo;
-			ret = tee_alg_get_digest_size(
-					rsa_data.mgf_algo,
-					&rsa_data.mgf_digest_size);
+			ret = tee_alg_get_digest_size(rsa_data.mgf_algo,
+						      &rsa_data.mgf_size);
 			if (ret != TEE_SUCCESS)
 				return ret;
 

diff --git a/core/drivers/crypto/crypto_api/include/drvcrypt_acipher.h b/core/drivers/crypto/crypto_api/include/drvcrypt_acipher.h
@@ -69,7 +69,7 @@ struct drvcrypt_rsa_ed {
 	struct drvcrypt_buf cipher;  /* Cipher encrypted or to decrypt */
 	struct drvcrypt_buf label;   /* Additional Label (RSAES) */
 	uint32_t mgf_algo;           /* MGF1 hash algorithm (RSAES) */
-	size_t mgf_digest_size;      /* MGF1 hash digest size (RSAES) */
+	size_t mgf_size;             /* MGF1 hash digest size (RSAES) */
 
 	/* RSA Mask Generation function */
 	TEE_Result (*mgf)(struct drvcrypt_rsa_mgf *mgf_data);