nrf_security: CRACEN: update Kconfig naming

degjorva · rlubos · commit c6ec17868372 · 2025-08-05T10:10:42.000+02:00
Update CRACEN_USE_MULTIPART_WORKAROUNDS to NEED.
This keeps the config naming consistent.

Signed-off-by: Dag Erik Gjørvad &lt;dag.erik.gjorvad@nordicsemi.no&gt;
diff --git a/subsys/nrf_security/src/drivers/cracen/Kconfig b/subsys/nrf_security/src/drivers/cracen/Kconfig
@@ -13,7 +13,7 @@ config CRACEN_HW_VERSION_BASE
 config CRACEN_HW_VERSION_LITE
 	def_bool SOC_NRF54LM20A || SOC_NRF54LV10A
 
-config CRACEN_USE_MULTIPART_WORKAROUNDS
+config CRACEN_NEED_MULTIPART_WORKAROUNDS
 	def_bool SOC_NRF54LM20A
 
 config CRACEN_NEED_IKG_INTERRUPT_WORKAROUND
diff --git a/subsys/nrf_security/src/drivers/cracen/cracenpsa/cracenpsa.cmake b/subsys/nrf_security/src/drivers/cracen/cracenpsa/cracenpsa.cmake
@@ -90,7 +90,7 @@ if(CONFIG_PSA_NEED_CRACEN_MAC_DRIVER)
   endif()
 
   if(CONFIG_PSA_NEED_CRACEN_CMAC)
-    if(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)
+    if(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)
       list(APPEND cracen_driver_sources
         ${CMAKE_CURRENT_LIST_DIR}/src/cracen_sw_mac_cmac.c
       )
diff --git a/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_primitives.h b/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_primitives.h
@@ -213,9 +213,9 @@ struct cracen_mac_operation_s {
 			struct sxmac ctx;
 			struct sxkeyref keyref;
 			uint8_t key_buffer[CRACEN_MAX_AES_KEY_SIZE];
-#if defined(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)
+#if defined(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)
 			cracen_cmac_context_t sw_ctx;
-#endif /* CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS */
+#endif /* CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS */
 		} cmac;
 #endif /* PSA_NEED_CRACEN_CMAC */
 		uint8_t _unused;
diff --git a/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/mac.c b/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/mac.c
@@ -40,14 +40,14 @@ static psa_status_t setup(cracen_mac_operation_t *operation, const psa_key_attri
 		}
 	}
 	if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-	    IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+	    IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(alg) == PSA_ALG_CMAC) {
 			return cracen_sw_cmac_setup(operation, attributes, key_buffer,
 						    key_buffer_size);
 		}
 	}
 	if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-	    !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+	    !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(alg) == PSA_ALG_CMAC) {
 			return cracen_cmac_setup(operation, attributes, key_buffer,
 						 key_buffer_size);
@@ -91,14 +91,14 @@ psa_status_t cracen_mac_update(cracen_mac_operation_t *operation, const uint8_t
 		}
 	}
 	if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-	    IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+	    IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {
 			return cracen_sw_cmac_update(operation, input, input_length);
 		}
 	}
 
 	if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-	    !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+	    !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {
 			return cracen_cmac_update(operation, input, input_length);
 		}
@@ -130,12 +130,12 @@ psa_status_t cracen_mac_sign_finish(cracen_mac_operation_t *operation, uint8_t *
 		}
 	}
 	if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-	    IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+	    IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {
 			status = cracen_sw_cmac_finish(operation);
 		}
 	} else if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-		   !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+		   !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {
 			status = cracen_cmac_finish(operation);
 		}
@@ -180,12 +180,12 @@ psa_status_t cracen_mac_verify_finish(cracen_mac_operation_t *operation, const u
 		}
 	}
 	if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-	    IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+	    IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {
 			status = cracen_sw_cmac_finish(operation);
 		}
 	} else if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-		   !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {
+		   !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {
 		if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {
 			status = cracen_cmac_finish(operation);
 		}
@@ -220,7 +220,7 @@ psa_status_t cracen_mac_compute(const psa_key_attributes_t *attributes, const ui
 	}
 
 	if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&
-	    IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS) &&
+	    IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS) &&
 	    PSA_ALG_FULL_LENGTH_MAC(alg) == PSA_ALG_CMAC) {
 
 		if (mac_size < operation.mac_size) {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ if(CONFIG_PSA_NEED_CRACEN_MAC_DRIVER)`
`90`	`90`	`endif()`
`91`	`91`
`92`	`92`	`if(CONFIG_PSA_NEED_CRACEN_CMAC)`
`93`		`- if(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)`
	`93`	`+ if(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)`
`94`	`94`	`list(APPEND cracen_driver_sources`
`95`	`95`	`${CMAKE_CURRENT_LIST_DIR}/src/cracen_sw_mac_cmac.c`
`96`	`96`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,14 @@ static psa_status_t setup(cracen_mac_operation_t *operation, const psa_key_attri`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`43`		`- IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`43`	`+ IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`44`	`44`	`if (PSA_ALG_FULL_LENGTH_MAC(alg) == PSA_ALG_CMAC) {`
`45`	`45`	`return cracen_sw_cmac_setup(operation, attributes, key_buffer,`
`46`	`46`	`key_buffer_size);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`50`		`- !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`50`	`+ !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`51`	`51`	`if (PSA_ALG_FULL_LENGTH_MAC(alg) == PSA_ALG_CMAC) {`
`52`	`52`	`return cracen_cmac_setup(operation, attributes, key_buffer,`
`53`	`53`	`key_buffer_size);`
`@@ -91,14 +91,14 @@ psa_status_t cracen_mac_update(cracen_mac_operation_t *operation, const uint8_t`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`94`		`- IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`94`	`+ IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`95`	`95`	`if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {`
`96`	`96`	`return cracen_sw_cmac_update(operation, input, input_length);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`101`		`- !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`101`	`+ !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`102`	`102`	`if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {`
`103`	`103`	`return cracen_cmac_update(operation, input, input_length);`
`104`	`104`	`}`
`@@ -130,12 +130,12 @@ psa_status_t cracen_mac_sign_finish(cracen_mac_operation_t operation, uint8_t `
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`133`		`- IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`133`	`+ IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`134`	`134`	`if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {`
`135`	`135`	`status = cracen_sw_cmac_finish(operation);`
`136`	`136`	`}`
`137`	`137`	`} else if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`138`		`- !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`138`	`+ !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`139`	`139`	`if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {`
`140`	`140`	`status = cracen_cmac_finish(operation);`
`141`	`141`	`}`
`@@ -180,12 +180,12 @@ psa_status_t cracen_mac_verify_finish(cracen_mac_operation_t *operation, const u`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`	`if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`183`		`- IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`183`	`+ IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`184`	`184`	`if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {`
`185`	`185`	`status = cracen_sw_cmac_finish(operation);`
`186`	`186`	`}`
`187`	`187`	`} else if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`188`		`- !IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS)) {`
	`188`	`+ !IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS)) {`
`189`	`189`	`if (PSA_ALG_FULL_LENGTH_MAC(operation->alg) == PSA_ALG_CMAC) {`
`190`	`190`	`status = cracen_cmac_finish(operation);`
`191`	`191`	`}`
`@@ -220,7 +220,7 @@ psa_status_t cracen_mac_compute(const psa_key_attributes_t *attributes, const ui`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`if (IS_ENABLED(PSA_NEED_CRACEN_CMAC) &&`
`223`		`- IS_ENABLED(CONFIG_CRACEN_USE_MULTIPART_WORKAROUNDS) &&`
	`223`	`+ IS_ENABLED(CONFIG_CRACEN_NEED_MULTIPART_WORKAROUNDS) &&`
`224`	`224`	`PSA_ALG_FULL_LENGTH_MAC(alg) == PSA_ALG_CMAC) {`
`225`	`225`
`226`	`226`	`if (mac_size < operation.mac_size) {`