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/common.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/common.c')
| -rw-r--r-- | src/common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common.c b/src/common.c index cfef402c39..3ec841d270 100644 --- a/src/common.c +++ b/src/common.c @@ -769,6 +769,12 @@ parse_ciphers (char **ciphers, int nciphers, int *cipher_priority) cipher_priority[j++] = GNUTLS_CIPHER_ARCFOUR_40; else if (strcasecmp (ciphers[i], "ARCFOUR") == 0) cipher_priority[j++] = GNUTLS_CIPHER_ARCFOUR_128; +#ifdef ENABLE_CAMELLIA + else if (strncasecmp (ciphers[i], "CAMELLIA-2", 10) == 0) + cipher_priority[j++] = GNUTLS_CIPHER_CAMELLIA_256_CBC; + else if (strncasecmp (ciphers[i], "CAM", 3) == 0) + cipher_priority[j++] = GNUTLS_CIPHER_CAMELLIA_128_CBC; +#endif else if (strncasecmp (ciphers[i], "NUL", 3) == 0) cipher_priority[j++] = GNUTLS_CIPHER_NULL; else |