initial remove of MBEDTLS_USE_PSA_CRYPTO

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
diff --git a/programs/fuzz/fuzz_x509csr.c b/programs/fuzz/fuzz_x509csr.c
index 4ab071f..1c26e6f 100644
--- a/programs/fuzz/fuzz_x509csr.c
+++ b/programs/fuzz/fuzz_x509csr.c
@@ -12,31 +12,27 @@
     unsigned char buf[4096];
 
     mbedtls_x509_csr_init(&csr);
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
     psa_status_t status = psa_crypto_init();
     if (status != PSA_SUCCESS) {
         goto exit;
     }
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
     ret = mbedtls_x509_csr_parse(&csr, Data, Size);
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
     if (ret == 0) {
         ret = mbedtls_x509_csr_info((char *) buf, sizeof(buf) - 1, " ", &csr);
     }
-#else
+#else /* !MBEDTLS_X509_REMOVE_INFO */
     ((void) ret);
     ((void) buf);
 #endif /* !MBEDTLS_X509_REMOVE_INFO */
 
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
 exit:
     mbedtls_psa_crypto_free();
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
     mbedtls_x509_csr_free(&csr);
-#else
+#else /* MBEDTLS_X509_CSR_PARSE_C */
     (void) Data;
     (void) Size;
-#endif
+#endif /* MBEDTLS_X509_CSR_PARSE_C */
 
     return 0;
 }