commit af5363c24e822960f1c8ff7af66f76d05ddc29eb
author John Durkop <john.durkop@fermatsoftware.com> Mon Aug 24 08:29:39 2020 -0700
committer John Durkop <john.durkop@fermatsoftware.com> Mon Aug 24 08:29:39 2020 -0700
tree f0f7686f217b4727832d9974855535f1819d035c
parent c14be901eb1bc0c065690b2d6bc458e8530bf90f

Updates to cleanup fixes for #3294

Minor updates to changelog for more concise wording and fixed styling
in other files as needed.

Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index fd4a875..33253a4 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -34,7 +34,7 @@
 #include "mbedtls/ecp.h"
 #endif
 
-#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_USE_PSA_CRYPTO)
+#if defined(MBEDTLS_ECDSA_C)
 #include "mbedtls/ecdsa.h"
 #endif
 
@@ -1012,8 +1012,8 @@
     ((void) sig_len);
     ((void) f_rng);
     ((void) p_rng);
-    return( PSA_ERROR_NOT_SUPPORTED );
-#else
+    return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
+#else /* !MBEDTLS_ECDSA_C */
     const psa_key_handle_t *key = (const psa_key_handle_t *) ctx;
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_algorithm_t alg = PSA_ALG_ECDSA( mbedtls_psa_translate_md( md_alg ) );
@@ -1044,7 +1044,7 @@
 
     /* transcode it to ASN.1 sequence */
     return( pk_ecdsa_sig_asn1_from_psa( sig, sig_len, buf_len ) );
-#endif
+#endif /* !MBEDTLS_ECDSA_C */
 }
 
 const mbedtls_pk_info_t mbedtls_pk_opaque_info = {