commit d24dfad7af48e167d1f202e7901db18429a71ca4
author Valerio Setti <valerio.setti@nordicsemi.no> Wed Apr 23 11:13:02 2025 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Wed May 07 09:06:52 2025 +0200
tree 96c43541b29f8aa3edae8d4d4c9d2b6d063092af
parent 68878ccdd0c24e9522652e334175a48f488fadfd

library: x509: remove sig_opts from mbedtls_x509_sig_alg_gets()

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index 8ca7dde..9fc6389 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -1037,8 +1037,7 @@
  * Helper for writing signature algorithms
  */
 int mbedtls_x509_sig_alg_gets(char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
-                              mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
-                              const void *sig_opts)
+                              mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg)
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     char *p = buf;
@@ -1055,23 +1054,17 @@
 
 #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
     if (pk_alg == MBEDTLS_PK_RSASSA_PSS) {
-        const mbedtls_pk_rsassa_pss_options *pss_opts;
-
-        pss_opts = (const mbedtls_pk_rsassa_pss_options *) sig_opts;
-
         const char *name = md_type_to_string(md_alg);
-        const char *mgf_name = md_type_to_string(pss_opts->mgf1_hash_id);
-
-        ret = mbedtls_snprintf(p, n, " (%s, MGF1-%s, 0x%02X)",
-                               name ? name : "???",
-                               mgf_name ? mgf_name : "???",
-                               (unsigned int) pss_opts->expected_salt_len);
+        if (name != NULL) {
+            ret = mbedtls_snprintf(p, n, " (%s)", name);
+        } else {
+            ret = mbedtls_snprintf(p, n, " (?)");
+        }
         MBEDTLS_X509_SAFE_SNPRINTF;
     }
 #else
     ((void) pk_alg);
     ((void) md_alg);
-    ((void) sig_opts);
 #endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
 
     return (int) (size - n);

library/x509_crl.c

diff --git a/library/x509_crl.c b/library/x509_crl.c
index 81af93b..0b98ba4 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -645,8 +645,7 @@
     ret = mbedtls_snprintf(p, n, "\n%ssigned using  : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_x509_sig_alg_gets(p, n, &crl->sig_oid, crl->sig_pk, crl->sig_md,
-                                    crl->sig_opts);
+    ret = mbedtls_x509_sig_alg_gets(p, n, &crl->sig_oid, crl->sig_pk, crl->sig_md);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
     ret = mbedtls_snprintf(p, n, "\n");

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 47907f2..b4c7d8a 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1799,8 +1799,7 @@
     ret = mbedtls_snprintf(p, n, "\n%ssigned using      : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_x509_sig_alg_gets(p, n, &crt->sig_oid, crt->sig_pk,
-                                    crt->sig_md, crt->sig_opts);
+    ret = mbedtls_x509_sig_alg_gets(p, n, &crt->sig_oid, crt->sig_pk, crt->sig_md);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
     /* Key size */

library/x509_csr.c

diff --git a/library/x509_csr.c b/library/x509_csr.c
index c4a1284..2e43564 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -546,8 +546,7 @@
     ret = mbedtls_snprintf(p, n, "\n%ssigned using  : ", prefix);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
-    ret = mbedtls_x509_sig_alg_gets(p, n, &csr->sig_oid, csr->sig_pk, csr->sig_md,
-                                    csr->sig_opts);
+    ret = mbedtls_x509_sig_alg_gets(p, n, &csr->sig_oid, csr->sig_pk, csr->sig_md);
     MBEDTLS_X509_SAFE_SNPRINTF;
 
     if ((ret = mbedtls_x509_key_size_helper(key_size_str, MBEDTLS_BEFORE_COLON,

library/x509_internal.h

diff --git a/library/x509_internal.h b/library/x509_internal.h
index dc56bf6..9360471 100644
--- a/library/x509_internal.h
+++ b/library/x509_internal.h
@@ -44,8 +44,7 @@
                          mbedtls_x509_buf *ext, int tag);
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
 int mbedtls_x509_sig_alg_gets(char *buf, size_t size, const mbedtls_x509_buf *sig_oid,
-                              mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg,
-                              const void *sig_opts);
+                              mbedtls_pk_type_t pk_alg, mbedtls_md_type_t md_alg);
 #endif
 int mbedtls_x509_key_size_helper(char *buf, size_t buf_size, const char *name);
 int mbedtls_x509_set_extension(mbedtls_asn1_named_data **head, const char *oid, size_t oid_len,