Merge CCM cipher mode and ciphersuites

Conflicts:
	library/ssl_tls.c

include/polarssl/config.h

@@ -1274,6 +1274,20 @@
  */
 #define POLARSSL_CAMELLIA_C
 
+/**
+ * \def POLARSSL_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: POLARSSL_AES_C or POLARSSL_CAMELLIA_C
+ *
+ * This module enables the AES-CCM ciphersuites, if other requisites are
+ * enabled as well.
+ */
+#define POLARSSL_CCM_C
+
 /**
  * \def POLARSSL_CERTS_C
  *