commit 94210b13eb8f799a3a5f5e024dde4810cea96fda
author Dave Rodgman <dave.rodgman@arm.com> Wed Jun 28 14:08:07 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Jun 28 14:08:07 2023 +0100
tree 087848a205fcdfd2f92d98c3c6d60e54874bf57f
parent bae79fa16e45961fee76176257838296de5a0c40

Compile fixes

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

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 4335f2c..76fe0c8 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1229,11 +1229,14 @@
                          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;
 #endif
 
+    (void) pk_info;
+
     PK_VALIDATE_RET(pk != NULL);
     if (keylen == 0) {
         return MBEDTLS_ERR_PK_KEY_INVALID_FORMAT;
@@ -1255,7 +1258,6 @@
     }
 
     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 f229949..88e6855 100644
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@@ -175,11 +175,13 @@
 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;
+    (void) ret;
 
     PK_VALIDATE_RET(p != NULL);
     PK_VALIDATE_RET(*p != NULL);