commit 1262315a1a1c7a7ab2d4b72f85acbab882ef266c
author Dave Rodgman <dave.rodgman@arm.com> Wed Jun 28 11:54:25 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Jun 28 11:54:25 2023 +0100
tree d519cfc91153a69a3133f0f89c60a11ab0acf9a8
parent f488c2ca79102db56a2d67782341d91eb7456e7b

Fix warnings re: unused variables in pkparse and pkwrite

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index deaff0b..4335f2c 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1229,7 +1229,6 @@
                          const unsigned char *pwd, size_t pwdlen)
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
-    const mbedtls_pk_info_t *pk_info;
 #if defined(MBEDTLS_PEM_PARSE_C)
     size_t len;
     mbedtls_pem_context pem;
@@ -1256,6 +1255,7 @@
     }
 
     if (ret == 0) {
+        const mbedtls_pk_info_t *pk_info;
         pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
         if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
             (ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),

library/pkwrite.c

diff --git a/library/pkwrite.c b/library/pkwrite.c
index 0107f20..f229949 100644
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@@ -175,9 +175,12 @@
 int mbedtls_pk_write_pubkey(unsigned char **p, unsigned char *start,
                             const mbedtls_pk_context *key)
 {
-    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     size_t len = 0;
 
+    (void) p;
+    (void) start;
+    (void) key;
+
     PK_VALIDATE_RET(p != NULL);
     PK_VALIDATE_RET(*p != NULL);
     PK_VALIDATE_RET(start != NULL);
@@ -313,6 +316,10 @@
     unsigned char *c;
     size_t len = 0;
 
+    (void) ret;
+    (void) c;
+    (void) key;
+
     PK_VALIDATE_RET(key != NULL);
     if (size == 0) {
         return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL;