diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-09-24 12:39:58 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-09-24 12:39:58 +0200 |
| commit | 3e36432062f6a1a1758a13591aed7951d4081a30 (patch) | |
| tree | c79fec7a1692bbd9259bf974220617607cb04793 /src/tests.c | |
| parent | 4f1a8ab89e804066e54dce364b15f00d9c2e3f30 (diff) | |
| download | gnutls-3e36432062f6a1a1758a13591aed7951d4081a30.tar.gz | |
Add patch to support Camellia, contributed by Yoshisato YANAGISAWA. Fixes #1.
See http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/2331
Diffstat (limited to 'src/tests.c')
| -rw-r--r-- | src/tests.c | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/src/tests.c b/src/tests.c index 9c36b20b99..bc9bc11be9 100644 --- a/src/tests.c +++ b/src/tests.c @@ -154,12 +154,14 @@ ADD_CIPHER (gnutls_session_t session, int cipher) } static void -ADD_CIPHER3 (gnutls_session_t session, int cipher1, int cipher2, int cipher3) +ADD_CIPHER4 (gnutls_session_t session, int cipher1, int cipher2, int cipher3, + int cipher4) { - static int _cipher_priority[] = { 0, 0, 0, 0 }; + static int _cipher_priority[] = { 0, 0, 0, 0, 0 }; _cipher_priority[0] = cipher1; _cipher_priority[1] = cipher2; _cipher_priority[2] = cipher3; + _cipher_priority[3] = cipher4; gnutls_cipher_set_priority (session, _cipher_priority); } @@ -560,6 +562,24 @@ test_aes (gnutls_session_t session) return ret; } +#ifdef ENABLE_CAMELLIA +test_code_t +test_camellia (gnutls_session_t session) +{ + int ret; + ADD_CIPHER (session, GNUTLS_CIPHER_CAMELLIA_128_CBC); + ADD_ALL_COMP (session); + ADD_ALL_CERTTYPES (session); + ADD_ALL_PROTOCOLS (session); + ADD_ALL_MACS (session); + ADD_ALL_KX (session); + gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred); + + ret = do_handshake (session); + return ret; +} +#endif + test_code_t test_openpgp1 (gnutls_session_t session) { @@ -586,8 +606,13 @@ test_code_t test_unknown_ciphersuites (gnutls_session_t session) { int ret; - ADD_CIPHER3 (session, GNUTLS_CIPHER_AES_128_CBC, - GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128); +#ifdef ENABLE_CAMELLIA + ADD_CIPHER4 (session, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, + GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_CIPHER_ARCFOUR_128); +#else + ADD_CIPHER4 (session, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, + GNUTLS_CIPHER_ARCFOUR_128, 0); +#endif ADD_ALL_COMP (session); ADD_ALL_CERTTYPES (session); ADD_ALL_PROTOCOLS (session); |