diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-10-08 14:41:40 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-10-08 14:41:40 +0200 |
| commit | 2e83418372099b93324b845c3f655140a6965c98 (patch) | |
| tree | 72213d665edb9f2d8e74e08c2ea7d747c5803402 | |
| parent | 643ebdf12b415fc3edd3b7bc12654bc92d3aed24 (diff) | |
| download | gnutls-2e83418372099b93324b845c3f655140a6965c98.tar.gz | |
test for camellia
| -rw-r--r-- | src/tests.c | 10 | ||||
| -rw-r--r-- | src/tests.h | 2 | ||||
| -rw-r--r-- | src/tls_test.c | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/src/tests.c b/src/tests.c index d5660ae75f..6d59b10be4 100644 --- a/src/tests.c +++ b/src/tests.c @@ -504,7 +504,6 @@ test_code_t test_aes_gcm (gnutls_session_t session) return ret; } -#ifdef ENABLE_CAMELLIA test_code_t test_camellia (gnutls_session_t session) { @@ -520,7 +519,6 @@ test_camellia (gnutls_session_t session) ret = do_handshake (session); return ret; } -#endif test_code_t test_openpgp1 (gnutls_session_t session) @@ -549,18 +547,10 @@ test_unknown_ciphersuites (gnutls_session_t session) { int ret; - -#ifdef ENABLE_CAMELLIA - sprintf (prio_str, - INIT_STR ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS - ":" ALL_KX ":%s", protocol_str, rest); - _gnutls_priority_set_direct (session, prio_str); -#else sprintf (prio_str, INIT_STR "+AES-128-CBC:" ALL_CIPHERS ":" ALL_COMP ":" ALL_CERTTYPES ":%s:" ALL_MACS ":" ALL_KX ":%s", protocol_str, rest); _gnutls_priority_set_direct (session, prio_str); -#endif gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred); diff --git a/src/tests.h b/src/tests.h index ed8fdb0cdd..e63c31b9f2 100644 --- a/src/tests.h +++ b/src/tests.h @@ -12,9 +12,7 @@ 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); -#ifdef ENABLE_CAMELLIA test_code_t test_camellia (gnutls_session_t state); -#endif 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); diff --git a/src/tls_test.c b/src/tls_test.c index 6b1d1cc387..207bbbcb56 100644 --- a/src/tls_test.c +++ b/src/tls_test.c @@ -138,10 +138,8 @@ static const TLS_TEST tls_tests[] = { "dunno"}, {"for AES-CBC cipher support", test_aes, "yes", "no", "dunno"}, -#ifdef ENABLE_CAMELLIA {"for CAMELLIA cipher support", test_camellia, "yes", "no", "dunno"}, -#endif {"for 3DES-CBC cipher support", test_3des, "yes", "no", "dunno"}, {"for ARCFOUR 128 cipher support", test_arcfour, "yes", "no", "dunno"}, {"for ARCFOUR 40 cipher support", test_arcfour_40, "yes", "no", |