diff options
Diffstat (limited to 'libextra')
| -rw-r--r-- | libextra/gnutls_openssl.c | 28 | ||||
| -rw-r--r-- | libextra/opencdk/opencdk.h | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/libextra/gnutls_openssl.c b/libextra/gnutls_openssl.c index 4c2bb2383a..79654bae00 100644 --- a/libextra/gnutls_openssl.c +++ b/libextra/gnutls_openssl.c @@ -538,8 +538,15 @@ SSLv23_client_method (void) m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC; m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC; m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC; +#ifdef ENABLE_CAMELLIA + m->cipher_priority[3] = GNUTLS_CIPHER_CAMELLIA_128_CBC; + m->cipher_priority[4] = GNUTLS_CIPHER_CAMELLIA_256_CBC; + m->cipher_priority[5] = GNUTLS_CIPHER_ARCFOUR_128; + m->cipher_priority[6] = 0; +#else m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128; m->cipher_priority[4] = 0; +#endif m->comp_priority[0] = GNUTLS_COMP_ZLIB; m->comp_priority[1] = GNUTLS_COMP_NULL; @@ -574,8 +581,15 @@ SSLv23_server_method (void) m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC; m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC; m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC; +#ifdef ENABLE_CAMELLIA + m->cipher_priority[3] = GNUTLS_CIPHER_CAMELLIA_128_CBC; + m->cipher_priority[4] = GNUTLS_CIPHER_CAMELLIA_256_CBC; + m->cipher_priority[5] = GNUTLS_CIPHER_ARCFOUR_128; + m->cipher_priority[6] = 0; +#else m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128; m->cipher_priority[4] = 0; +#endif m->comp_priority[0] = GNUTLS_COMP_ZLIB; m->comp_priority[1] = GNUTLS_COMP_NULL; @@ -675,8 +689,15 @@ TLSv1_client_method (void) m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC; m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC; m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC; +#ifdef ENABLE_CAMELLIA + m->cipher_priority[3] = GNUTLS_CIPHER_CAMELLIA_128_CBC; + m->cipher_priority[4] = GNUTLS_CIPHER_CAMELLIA_256_CBC; + m->cipher_priority[5] = GNUTLS_CIPHER_ARCFOUR_128; + m->cipher_priority[6] = 0; +#else m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128; m->cipher_priority[4] = 0; +#endif m->comp_priority[0] = GNUTLS_COMP_ZLIB; m->comp_priority[1] = GNUTLS_COMP_NULL; @@ -710,8 +731,15 @@ TLSv1_server_method (void) m->cipher_priority[0] = GNUTLS_CIPHER_AES_128_CBC; m->cipher_priority[1] = GNUTLS_CIPHER_3DES_CBC; m->cipher_priority[2] = GNUTLS_CIPHER_AES_256_CBC; +#ifdef ENABLE_CAMELLIA + m->cipher_priority[3] = GNUTLS_CIPHER_CAMELLIA_128_CBC; + m->cipher_priority[4] = GNUTLS_CIPHER_CAMELLIA_256_CBC; + m->cipher_priority[5] = GNUTLS_CIPHER_ARCFOUR_128; + m->cipher_priority[6] = 0; +#else m->cipher_priority[3] = GNUTLS_CIPHER_ARCFOUR_128; m->cipher_priority[4] = 0; +#endif m->comp_priority[0] = GNUTLS_COMP_ZLIB; m->comp_priority[1] = GNUTLS_COMP_NULL; diff --git a/libextra/opencdk/opencdk.h b/libextra/opencdk/opencdk.h index e5a4b52e24..ea2f1b24bd 100644 --- a/libextra/opencdk/opencdk.h +++ b/libextra/opencdk/opencdk.h @@ -195,7 +195,8 @@ enum cdk_cipher_algo_t { CDK_CIPHER_AES = 7, CDK_CIPHER_AES192 = 8, CDK_CIPHER_AES256 = 9, - CDK_CIPHER_TWOFISH = 10 + CDK_CIPHER_TWOFISH = 10, + CDK_CIPHER_CAMELLIA256 = 11 /* experimental use only, upcoming 2440bis */ }; |