gnutls-cli-debug tests for camellia-gcm.

diff --git a/src/cli-debug.c b/src/cli-debug.c
index ab09f971e87558ad24cf78787f879314f364b3b8..cd9a51dfbe9192e767ab7b78533f3a3e774f70f7 100644 (file)
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -156,7 +156,9 @@ static const TLS_TEST tls_tests[] = {
         "dunno"},
        {"for AES-CBC cipher support", test_aes, "yes", "no",
         "dunno"},
-       {"for CAMELLIA cipher support", test_camellia, "yes", "no",
+       {"for CAMELLIA-GCM cipher support", test_camellia_gcm, "yes", "no",
+        "dunno"},
+       {"for CAMELLIA-CBC cipher support", test_camellia_cbc, "yes", "no",
         "dunno"},
        {"for 3DES-CBC cipher support", test_3des, "yes", "no", "dunno"},
        {"for ARCFOUR 128 cipher support", test_arcfour, "yes", "no",

diff --git a/src/tests.c b/src/tests.c
index 6f8ccdd427a4ae3cd1b41b9e4f17f82295b75892..ca28cea8a59c9f557d5b4d045d6b2c48849cd667 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -412,7 +412,7 @@ test_code_t test_aes_gcm(gnutls_session_t session)
        return ret;
 }
 
-test_code_t test_camellia(gnutls_session_t session)
+test_code_t test_camellia_cbc(gnutls_session_t session)
 {
        int ret;
 
@@ -427,6 +427,21 @@ test_code_t test_camellia(gnutls_session_t session)
        return ret;
 }
 
+test_code_t test_camellia_gcm(gnutls_session_t session)
+{
+       int ret;
+
+       sprintf(prio_str,
+               INIT_STR "+CAMELLIA-128-GCM:+AEAD:" ALL_COMP ":" ALL_CERTTYPES
+               ":%s:" ALL_KX ":%s", protocol_str, rest);
+       _gnutls_priority_set_direct(session, prio_str);
+
+       gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+
+       ret = do_handshake(session);
+       return ret;
+}
+
 test_code_t test_openpgp1(gnutls_session_t session)
 {
        int ret;

diff --git a/src/tests.h b/src/tests.h
index 9f0e348f50e289ff24517383e57775e535038c42..def0eaa18271fe4e42b531c0050424e75e70ec4e 100644 (file)
--- a/src/tests.h
+++ b/src/tests.h
@@ -31,7 +31,8 @@ test_code_t test_dhe(gnutls_session_t state);
 test_code_t test_dhe_group(gnutls_session_t state);
 test_code_t test_ssl3(gnutls_session_t state);
 test_code_t test_aes(gnutls_session_t state);
-test_code_t test_camellia(gnutls_session_t state);
+test_code_t test_camellia_cbc(gnutls_session_t state);
+test_code_t test_camellia_gcm(gnutls_session_t state);
 test_code_t test_md5(gnutls_session_t state);
 test_code_t test_sha(gnutls_session_t state);
 test_code_t test_3des(gnutls_session_t state);