net: Remove deprecated TLS_CREDENTIAL_SERVER_CERTIFICATE symbol usage

rlubos · rlubos · commit 55a183cec4ad · 2026-05-13T16:08:09.000+02:00
The symbol was deprecated in Zephyr 4.2.0 in favor of
TLS_CREDENTIAL_PUBLIC_CERTIFICATE and  will be removed soon, so
remove any leftover usage in NCS.

Signed-off-by: Robert Lubos &lt;robert.lubos@nordicsemi.no&gt;
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
@@ -87,7 +87,7 @@ static int tls_set_credentials_from_ps(void)
 	}
 
 	int err = tls_credential_add(SERVER_CERTIFICATE_TAG,
-				     TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				     TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				     server_cert_buf, cred_len);
 	if (err < 0) {
 		LOG_ERR("Failed to register Server certificate from"
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
@@ -20,7 +20,7 @@ int tls_set_credentials(void)
 	LOG_INF("Registering Server certificate and key");
 
 	int err = tls_credential_add(SERVER_CERTIFICATE_TAG,
-				     TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				     TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				     server_certificate,
 				     sizeof(server_certificate));
 	if (err < 0) {
diff --git a/samples/dect/dect_shell/src/native_tls/desh_native_tls.c b/samples/dect/dect_shell/src/native_tls/desh_native_tls.c
@@ -61,7 +61,7 @@ enum tls_credential_type desh_cmng_to_tls_cred(enum desh_cmng_type type)
 	case DESH_AT_CMNG_TYPE_CA_CERT:
 		return TLS_CREDENTIAL_CA_CERTIFICATE;
 	case DESH_AT_CMNG_TYPE_CLIENT_CERT:
-		return TLS_CREDENTIAL_SERVER_CERTIFICATE;
+		return TLS_CREDENTIAL_PUBLIC_CERTIFICATE;
 	case DESH_AT_CMNG_TYPE_CLIENT_KEY:
 		return TLS_CREDENTIAL_PRIVATE_KEY;
 	case DESH_AT_CMNG_TYPE_PSK:
diff --git a/samples/net/http_server/src/credentials_provision.c b/samples/net/http_server/src/credentials_provision.c
@@ -51,7 +51,7 @@ int credentials_provision(void)
 	}
 
 	ret = tls_credential_add(CONFIG_HTTP_SERVER_SAMPLE_SERVER_CERTIFICATE_SEC_TAG,
-				 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				 server_certificate,
 				 sizeof(server_certificate));
 	if (ret == -EEXIST) {
diff --git a/subsys/net/lib/mqtt_helper/mqtt_helper.c b/subsys/net/lib/mqtt_helper/mqtt_helper.c
@@ -175,7 +175,7 @@ static int certificates_provision(void)
 
 	if (sizeof(device_certificate) > 1) {
 		err = tls_credential_add(CONFIG_MQTT_HELPER_SEC_TAG,
-					 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+					 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 					 device_certificate,
 					 sizeof(device_certificate));
 		if (err == -EEXIST) {
@@ -221,7 +221,7 @@ static int certificates_provision(void)
 
 	if (sizeof(device_certificate_2) > 1) {
 		err = tls_credential_add(CONFIG_MQTT_HELPER_SECONDARY_SEC_TAG,
-					 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+					 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 					 device_certificate_2,
 					 sizeof(device_certificate_2));
 		if (err == -EEXIST) {
diff --git a/subsys/net/lib/nrf_cloud/common/src/nrf_cloud_credentials.c b/subsys/net/lib/nrf_cloud/common/src/nrf_cloud_credentials.c
@@ -25,7 +25,7 @@ static int cred_type[CRED_COUNT] = {
 	MODEM_KEY_MGMT_CRED_TYPE_CA_CHAIN, MODEM_KEY_MGMT_CRED_TYPE_PUBLIC_CERT,
 	MODEM_KEY_MGMT_CRED_TYPE_PRIVATE_CERT
 #else
-	TLS_CREDENTIAL_CA_CERTIFICATE, TLS_CREDENTIAL_SERVER_CERTIFICATE, TLS_CREDENTIAL_PRIVATE_KEY
+	TLS_CREDENTIAL_CA_CERTIFICATE, TLS_CREDENTIAL_PUBLIC_CERTIFICATE, TLS_CREDENTIAL_PRIVATE_KEY
 #endif
 };
 
diff --git a/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c b/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c
@@ -520,7 +520,7 @@ static int certificate_register(void)
 	}
 
 	ret = tls_credential_add(CONFIG_SOFTAP_WIFI_PROVISION_CERTIFICATE_SEC_TAG,
-				 TLS_CREDENTIAL_SERVER_CERTIFICATE,
+				 TLS_CREDENTIAL_PUBLIC_CERTIFICATE,
 				 server_certificate,
 				 sizeof(server_certificate));
 	if (ret == -EEXIST) {
diff --git a/subsys/net/lib/tls_credentials/tls_credentials_nrf_modem.c b/subsys/net/lib/tls_credentials/tls_credentials_nrf_modem.c
@@ -77,7 +77,7 @@ static enum modem_key_mgmt_cred_type modem_key_mgmt_type_get(enum tls_credential
 	switch (type) {
 	case TLS_CREDENTIAL_CA_CERTIFICATE:
 		return MODEM_KEY_MGMT_CRED_TYPE_CA_CHAIN;
-	case TLS_CREDENTIAL_SERVER_CERTIFICATE:
+	case TLS_CREDENTIAL_PUBLIC_CERTIFICATE:
 		return MODEM_KEY_MGMT_CRED_TYPE_PUBLIC_CERT;
 	case TLS_CREDENTIAL_PRIVATE_KEY:
 		return MODEM_KEY_MGMT_CRED_TYPE_PRIVATE_CERT;
@@ -92,7 +92,7 @@ static enum tls_credential_type tls_credential_type_get(enum modem_key_mgmt_cred
 	case MODEM_KEY_MGMT_CRED_TYPE_CA_CHAIN:
 		return TLS_CREDENTIAL_CA_CERTIFICATE;
 	case MODEM_KEY_MGMT_CRED_TYPE_PUBLIC_CERT:
-		return TLS_CREDENTIAL_SERVER_CERTIFICATE;
+		return TLS_CREDENTIAL_PUBLIC_CERTIFICATE;
 	case MODEM_KEY_MGMT_CRED_TYPE_PRIVATE_CERT:
 		return TLS_CREDENTIAL_PRIVATE_KEY;
 	default:
diff --git a/tests/subsys/net/lib/tls_credentials_nrf_modem/main.c b/tests/subsys/net/lib/tls_credentials_nrf_modem/main.c
@@ -46,11 +46,11 @@ ZTEST(tls_credentials, test_00_init_import_list_public_api)
 	/* The server certificate and private key cannot be accessed, instead returning EACCESS. */
 	modem_key_mgmt_read_fake.return_val = -EACCES;
 
-	zassert_equal(tls_credential_get(1, TLS_CREDENTIAL_SERVER_CERTIFICATE, cred, &len),
+	zassert_equal(tls_credential_get(1, TLS_CREDENTIAL_PUBLIC_CERTIFICATE, cred, &len),
 		      -EACCES);
 	zassert_equal(tls_credential_get(1, TLS_CREDENTIAL_PRIVATE_KEY, cred, &len), -EACCES);
 
-	zassert_equal(tls_credential_get(2, TLS_CREDENTIAL_SERVER_CERTIFICATE, cred, &len),
+	zassert_equal(tls_credential_get(2, TLS_CREDENTIAL_PUBLIC_CERTIFICATE, cred, &len),
 		      -EACCES);
 	zassert_equal(tls_credential_get(2, TLS_CREDENTIAL_PRIVATE_KEY, cred, &len), -EACCES);
 }
@@ -61,10 +61,10 @@ ZTEST(tls_credentials, test_00_init_import_list_internal_api)
 	zassert_not_null(credential_get(101, TLS_CREDENTIAL_CA_CERTIFICATE));
 	zassert_not_null(credential_get(103, TLS_CREDENTIAL_CA_CERTIFICATE));
 
-	zassert_not_null(credential_get(1, TLS_CREDENTIAL_SERVER_CERTIFICATE));
+	zassert_not_null(credential_get(1, TLS_CREDENTIAL_PUBLIC_CERTIFICATE));
 	zassert_not_null(credential_get(1, TLS_CREDENTIAL_PRIVATE_KEY));
 
-	zassert_not_null(credential_get(2, TLS_CREDENTIAL_SERVER_CERTIFICATE));
+	zassert_not_null(credential_get(2, TLS_CREDENTIAL_PUBLIC_CERTIFICATE));
 	zassert_not_null(credential_get(2, TLS_CREDENTIAL_PRIVATE_KEY));
 }
 
@@ -94,7 +94,7 @@ ZTEST(tls_credentials, test_00_init_import_list_internal_api_iterator)
 	cred = credential_next_get(1, NULL);
 	zassert_not_null(cred);
 	zassert_equal(cred->tag, 1);
-	zassert_equal(cred->type, TLS_CREDENTIAL_SERVER_CERTIFICATE);
+	zassert_equal(cred->type, TLS_CREDENTIAL_PUBLIC_CERTIFICATE);
 	cred = credential_next_get(1, cred);
 	zassert_not_null(cred);
 	zassert_equal(cred->tag, 1);
@@ -108,7 +108,7 @@ ZTEST(tls_credentials, test_00_init_import_list_internal_api_iterator)
 	cred = credential_next_get(2, cred);
 	zassert_not_null(cred);
 	zassert_equal(cred->tag, 2);
-	zassert_equal(cred->type, TLS_CREDENTIAL_SERVER_CERTIFICATE);
+	zassert_equal(cred->type, TLS_CREDENTIAL_PUBLIC_CERTIFICATE);
 }
 
 /* base64(bin("B9BAC15641653CAE2B5151DCBD0C40DDCDF19125950FA2475977437EA35F7A45")) */

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ static int tls_set_credentials_from_ps(void)`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`int err = tls_credential_add(SERVER_CERTIFICATE_TAG,`
`90`		`- TLS_CREDENTIAL_SERVER_CERTIFICATE,`
	`90`	`+ TLS_CREDENTIAL_PUBLIC_CERTIFICATE,`
`91`	`91`	`server_cert_buf, cred_len);`
`92`	`92`	`if (err < 0) {`
`93`	`93`	`LOG_ERR("Failed to register Server certificate from"`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ int credentials_provision(void)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`ret = tls_credential_add(CONFIG_HTTP_SERVER_SAMPLE_SERVER_CERTIFICATE_SEC_TAG,`
`54`		`- TLS_CREDENTIAL_SERVER_CERTIFICATE,`
	`54`	`+ TLS_CREDENTIAL_PUBLIC_CERTIFICATE,`
`55`	`55`	`server_certificate,`
`56`	`56`	`sizeof(server_certificate));`
`57`	`57`	`if (ret == -EEXIST) {`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ static int certificate_register(void)`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`ret = tls_credential_add(CONFIG_SOFTAP_WIFI_PROVISION_CERTIFICATE_SEC_TAG,`
`523`		`- TLS_CREDENTIAL_SERVER_CERTIFICATE,`
	`523`	`+ TLS_CREDENTIAL_PUBLIC_CERTIFICATE,`
`524`	`524`	`server_certificate,`
`525`	`525`	`sizeof(server_certificate));`
`526`	`526`	`if (ret == -EEXIST) {`