ECHDE-PSK does not use a certificate
fixes #270
diff --git a/ChangeLog b/ChangeLog
index 20a9bcc..0712001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@
= mbed TLS 2.1.2 released 2015-10-06
+Bugfix
+ * Fix build error with configurations where ECDHE-PSK is the only key
+ exchange. Found and fix provided by Chris Hammond. #270
+
+= mbed TLS 2.1.2 released 2015-10-06
+
Security
* Added fix for CVE-2015-5291 to prevent heap corruption due to buffer
overflow of the hostname or session ticket. Found by Guido Vranken,
diff --git a/include/mbedtls/ssl_ciphersuites.h b/include/mbedtls/ssl_ciphersuites.h
index 025de28..b322f42 100644
--- a/include/mbedtls/ssl_ciphersuites.h
+++ b/include/mbedtls/ssl_ciphersuites.h
@@ -251,7 +251,6 @@
defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) || \
- defined(MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED)
#define MBEDTLS_KEY_EXCHANGE__WITH_CERT__ENABLED