tests: added CCM and CCM_8 into ciphersuite tests

3 files changed, 22 insertions, 2 deletions

diff --git a/tests/mini-record-2.c b/tests/mini-record-2.c
index 0be2f928ce..4f930d1ae7 100644
--- a/tests/mini-record-2.c
+++ b/tests/mini-record-2.c
@@ -413,6 +413,8 @@ static void start(const char *prio, int ign)
 #define AES_CBC "NONE:+VERS-TLS1.0:-CIPHER-ALL:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 #define AES_CBC_SHA256 "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 #define AES_GCM "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-GCM:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
+#define AES_CCM "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-CCM:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
+#define AES_CCM_8 "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-CCM-8:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 
 #define ARCFOUR_SHA1 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 #define ARCFOUR_MD5 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+MD5:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL:+RSA"
@@ -447,6 +449,8 @@ void doit(void)
 	start(AES_CBC, 1);
 	start(AES_CBC_SHA256, 1);
 	start(AES_GCM, 0);
+	start(AES_CCM, 0);
+	start(AES_CCM_8, 0);
 
 #ifndef ENABLE_FIPS140
 	start(NULL_SHA1, 0);
diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
index 009076f738..a13e9a1063 100644
--- a/tests/mini-record-failure.c
+++ b/tests/mini-record-failure.c
@@ -346,6 +346,8 @@ static void start(const char *prio, int ign)
 #define AES_CBC "NONE:+VERS-TLS1.0:-CIPHER-ALL:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 #define AES_CBC_SHA256 "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 #define AES_GCM "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-GCM:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
+#define AES_CCM "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-CCM:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
+#define AES_CCM_8 "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+AES-128-CCM-8:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 
 #define ARCFOUR_SHA1 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL"
 #define ARCFOUR_MD5 "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+MD5:+SIGN-ALL:+COMP-NULL:+ANON-ECDH:+CURVE-ALL:+RSA"
@@ -381,6 +383,8 @@ void doit(void)
 	start(AES_CBC, 1);
 	start(AES_CBC_SHA256, 1);
 	start(AES_GCM, 0);
+	start(AES_CCM, 0);
+	start(AES_CCM_8, 0);
 
 #ifndef ENABLE_FIPS140
 	start(NULL_SHA1, 0);
diff --git a/tests/mini-record.c b/tests/mini-record.c
index c85947167c..aae6fa6b68 100644
--- a/tests/mini-record.c
+++ b/tests/mini-record.c
@@ -181,7 +181,11 @@ static void client(int fd, const char *prio)
 	gnutls_dtls_set_mtu(session, 1500);
 
 	/* Use default priorities */
-	gnutls_priority_set_direct(session, prio, NULL);
+	ret = gnutls_priority_set_direct(session, prio, NULL);
+	if (ret < 0) {
+		fail("error in priority '%s': %s\n", prio, gnutls_strerror(ret));
+		exit(1);
+	}
 
 	/* put the anonymous credentials to the current session
 	 */
@@ -286,7 +290,11 @@ static void server(int fd, const char *prio)
 	/* avoid calling all the priority functions, since the defaults
 	 * are adequate.
 	 */
-	gnutls_priority_set_direct(session, prio, NULL);
+	ret = gnutls_priority_set_direct(session, prio, NULL);
+	if (ret < 0) {
+		fail("error in priority '%s': %s\n", prio, gnutls_strerror(ret));
+		exit(1);
+	}
 
 	gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
 	gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
@@ -381,6 +389,8 @@ static void start(const char *prio)
 #define AES_CBC "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
 #define AES_CBC_SHA256 "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
 #define AES_GCM "NONE:+VERS-DTLS1.2:-CIPHER-ALL:+RSA:+AES-128-GCM:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
+#define AES_CCM "NONE:+VERS-DTLS1.2:-CIPHER-ALL:+RSA:+AES-128-CCM:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
+#define AES_CCM_8 "NONE:+VERS-DTLS1.2:-CIPHER-ALL:+RSA:+AES-128-CCM-8:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
 #define CHACHA_POLY1305 "NONE:+VERS-DTLS1.2:-CIPHER-ALL:+RSA:+CHACHA20-POLY1305:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ECDHE-RSA:+CURVE-ALL"
 
 static void ch_handler(int sig)
@@ -406,6 +416,8 @@ void doit(void)
 	start(AES_CBC);
 	start(AES_CBC_SHA256);
 	start(AES_GCM);
+	start(AES_CCM);
+	start(AES_CCM_8);
 #ifndef ENABLE_FIPS140
 	start(CHACHA_POLY1305);
 #endif