commit e952a30d47c2e88315682ccc9a07d0e1c025d9ef
author Neil Armstrong <narmstrong@baylibre.com> Tue May 03 10:22:14 2022 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Wed May 04 11:08:41 2022 +0200
tree 9a0f6efa0ad9667366ebacdd99cae799ef601c1f
parent 61f237afb7b34f643a3d5ee1bcf4d6487c965eb3

Remove RAW PSK when MBEDTLS_USE_PSA_CRYPTO is selected

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 27883ba..2ff2a0e 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1428,8 +1428,7 @@
                               *   configured, this has value \c 0.
                               */
     uint8_t MBEDTLS_PRIVATE(psk_opaque_is_internal);
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
-
+#else
     unsigned char *MBEDTLS_PRIVATE(psk);      /*!< The raw pre-shared key. This field should
                               *   only be set via mbedtls_ssl_conf_psk().
                               *   If either no PSK or an opaque PSK
@@ -1439,6 +1438,7 @@
                               *   mbedtls_ssl_conf_psk().
                               *   Its value is non-zero if and only if
                               *   \c psk is not \c NULL. */
+#endif /* MBEDTLS_USE_PSA_CRYPTO */
 
     unsigned char *MBEDTLS_PRIVATE(psk_identity);    /*!< The PSK identity for PSK negotiation.
                                      *   This field should only be set via