[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-71-g5911868
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-71-g5911868 |
|
Date: |
Sun, 05 Jun 2011 11:56:45 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=591186874eefa2f277dbd82819df96ae59787e5b
The branch, master has been updated
via 591186874eefa2f277dbd82819df96ae59787e5b (commit)
via dcbf4c893ec70be58d6352b29ca4a9b33207daa2 (commit)
via df0362a3170776164a79305b2472b284c3cb83fc (commit)
from ca099b6b66858beba31d3209e616a655fa58175f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 591186874eefa2f277dbd82819df96ae59787e5b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 13:30:34 2011 +0200
When AES and GCM acceleration is available increase the priority of AES-GCM
ciphersuites in performance and normal cases.
commit dcbf4c893ec70be58d6352b29ca4a9b33207daa2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 13:17:15 2011 +0200
prevent compilation of gcrypt support since it is incomplete.
commit df0362a3170776164a79305b2472b284c3cb83fc
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Jun 5 13:07:33 2011 +0200
do not use NETTLE_LIBS to include hogweed and gmp.
removed ENABLE_CAMELLIA and NETTLE_GCM.
-----------------------------------------------------------------------
Summary of changes:
lib/Makefile.am | 2 +-
lib/accelerated/intel/aes-x86.c | 3 ++
lib/algorithms/ciphers.c | 2 -
lib/algorithms/ciphersuites.c | 16 ----------
lib/gcrypt/cipher.c | 4 +-
lib/gcrypt/pk.c | 2 +
lib/gnutls_global.h | 1 +
lib/gnutls_priority.c | 60 +++++++++++++++++++++++++++++++++------
lib/nettle/cipher.c | 13 --------
m4/hooks.m4 | 34 ++--------------------
10 files changed, 63 insertions(+), 74 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48bf752..133fddb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -135,7 +135,7 @@ libgnutls_la_LDFLAGS += $(LTLIBTASN1)
endif
if ENABLE_NETTLE
-libgnutls_la_LDFLAGS += $(LTLIBNETTLE) $(NETTLE_LIBS)
+libgnutls_la_LDFLAGS += $(LTLIBNETTLE)
libgnutls_la_LIBADD += nettle/libcrypto.la
else
libgnutls_la_LDFLAGS += $(LTLIBGCRYPT)
diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
index 5f3cc91..8bb6a5e 100644
--- a/lib/accelerated/intel/aes-x86.c
+++ b/lib/accelerated/intel/aes-x86.c
@@ -214,6 +214,9 @@ register_x86_crypto (void)
{
gnutls_assert ();
}
+
+ if (ret >= 0)
+ _gnutls_priority_prefer_aes_gcm();
}
}
diff --git a/lib/algorithms/ciphers.c b/lib/algorithms/ciphers.c
index 88c045e..7b845f9 100644
--- a/lib/algorithms/ciphers.c
+++ b/lib/algorithms/ciphers.c
@@ -57,12 +57,10 @@ static const gnutls_cipher_entry algorithms[] = {
{"ARCFOUR-128", GNUTLS_CIPHER_ARCFOUR_128, 1, 16, CIPHER_STREAM, 0, 0, 0},
{"ARCFOUR-40", GNUTLS_CIPHER_ARCFOUR_40, 1, 5, CIPHER_STREAM, 0, 1, 0},
{"RC2-40", GNUTLS_CIPHER_RC2_40_CBC, 8, 5, CIPHER_BLOCK, 8, 1, 0},
-#ifdef ENABLE_CAMELLIA
{"CAMELLIA-256-CBC", GNUTLS_CIPHER_CAMELLIA_256_CBC, 16, 32, CIPHER_BLOCK,
16, 0, 0},
{"CAMELLIA-128-CBC", GNUTLS_CIPHER_CAMELLIA_128_CBC, 16, 16, CIPHER_BLOCK,
16, 0, 0},
-#endif
#ifdef ENABLE_OPENPGP
{"IDEA-PGP-CFB", GNUTLS_CIPHER_IDEA_PGP_CFB, 8, 16, CIPHER_BLOCK, 8, 0, 0},
diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index ed98557..3946cb7 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -74,10 +74,8 @@ typedef struct
#define GNUTLS_ANON_DH_AES_256_CBC_SHA1 { 0x00, 0x3A }
/* rfc4132 */
-#ifdef ENABLE_CAMELLIA
#define GNUTLS_ANON_DH_CAMELLIA_128_CBC_SHA1 { 0x00,0x46 }
#define GNUTLS_ANON_DH_CAMELLIA_256_CBC_SHA1 { 0x00,0x89 }
-#endif
#define GNUTLS_ANON_DH_AES_128_CBC_SHA256 { 0x00, 0x6C }
#define GNUTLS_ANON_DH_AES_256_CBC_SHA256 { 0x00, 0x6D }
@@ -124,10 +122,8 @@ typedef struct
#define GNUTLS_RSA_AES_256_CBC_SHA1 { 0x00, 0x35 }
/* rfc4132 */
-#ifdef ENABLE_CAMELLIA
#define GNUTLS_RSA_CAMELLIA_128_CBC_SHA1 { 0x00,0x41 }
#define GNUTLS_RSA_CAMELLIA_256_CBC_SHA1 { 0x00,0x84 }
-#endif
#define GNUTLS_RSA_AES_128_CBC_SHA256 { 0x00, 0x3C }
#define GNUTLS_RSA_AES_256_CBC_SHA256 { 0x00, 0x3D }
@@ -149,10 +145,8 @@ typedef struct
#define GNUTLS_DHE_DSS_AES_128_CBC_SHA1 { 0x00, 0x32 }
/* rfc4132 */
-#ifdef ENABLE_CAMELLIA
#define GNUTLS_DHE_DSS_CAMELLIA_128_CBC_SHA1 { 0x00,0x44 }
#define GNUTLS_DHE_DSS_CAMELLIA_256_CBC_SHA1 { 0x00,0x87 }
-#endif
#define GNUTLS_DHE_DSS_AES_128_CBC_SHA256 { 0x00, 0x40 }
#define GNUTLS_DHE_DSS_AES_256_CBC_SHA256 { 0x00, 0x6A }
@@ -167,10 +161,8 @@ typedef struct
#define GNUTLS_DHE_RSA_AES_256_CBC_SHA1 { 0x00, 0x39 }
/* rfc4132 */
-#ifdef ENABLE_CAMELLIA
#define GNUTLS_DHE_RSA_CAMELLIA_128_CBC_SHA1 { 0x00,0x45 }
#define GNUTLS_DHE_RSA_CAMELLIA_256_CBC_SHA1 { 0x00,0x88 }
-#endif
#define GNUTLS_DHE_RSA_AES_128_CBC_SHA256 { 0x00, 0x67 }
#define GNUTLS_DHE_RSA_AES_256_CBC_SHA256 { 0x00, 0x6B }
@@ -254,7 +246,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA1, GNUTLS_SSL3,
GNUTLS_VERSION_MAX, 1),
-#ifdef ENABLE_CAMELLIA
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_CAMELLIA_128_CBC_SHA1,
GNUTLS_CIPHER_CAMELLIA_128_CBC,
GNUTLS_KX_ANON_DH,
@@ -265,7 +256,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA1, GNUTLS_TLS1,
GNUTLS_VERSION_MAX, 1),
-#endif
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_ANON_DH_AES_128_CBC_SHA256,
GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_ANON_DH,
GNUTLS_MAC_SHA256, GNUTLS_TLS1_2,
@@ -396,7 +386,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_DSS,
GNUTLS_MAC_SHA1, GNUTLS_SSL3,
GNUTLS_VERSION_MAX, 1),
-#ifdef ENABLE_CAMELLIA
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DHE_DSS_CAMELLIA_128_CBC_SHA1,
GNUTLS_CIPHER_CAMELLIA_128_CBC,
GNUTLS_KX_DHE_DSS,
@@ -407,7 +396,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_KX_DHE_DSS,
GNUTLS_MAC_SHA1, GNUTLS_TLS1,
GNUTLS_VERSION_MAX, 1),
-#endif
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DHE_DSS_AES_128_CBC_SHA256,
GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_DSS,
GNUTLS_MAC_SHA256, GNUTLS_TLS1_2,
@@ -429,7 +417,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_DHE_RSA,
GNUTLS_MAC_SHA1, GNUTLS_SSL3,
GNUTLS_VERSION_MAX, 1),
-#ifdef ENABLE_CAMELLIA
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DHE_RSA_CAMELLIA_128_CBC_SHA1,
GNUTLS_CIPHER_CAMELLIA_128_CBC,
GNUTLS_KX_DHE_RSA,
@@ -440,7 +427,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_KX_DHE_RSA,
GNUTLS_MAC_SHA1, GNUTLS_TLS1,
GNUTLS_VERSION_MAX, 1),
-#endif
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_DHE_RSA_AES_128_CBC_SHA256,
GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_DHE_RSA,
GNUTLS_MAC_SHA256, GNUTLS_TLS1_2,
@@ -490,7 +476,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_CIPHER_AES_256_CBC, GNUTLS_KX_RSA,
GNUTLS_MAC_SHA1, GNUTLS_SSL3,
GNUTLS_VERSION_MAX, 1),
-#ifdef ENABLE_CAMELLIA
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_RSA_CAMELLIA_128_CBC_SHA1,
GNUTLS_CIPHER_CAMELLIA_128_CBC, GNUTLS_KX_RSA,
GNUTLS_MAC_SHA1, GNUTLS_TLS1,
@@ -499,7 +484,6 @@ static const gnutls_cipher_suite_entry cs_algorithms[] = {
GNUTLS_CIPHER_CAMELLIA_256_CBC, GNUTLS_KX_RSA,
GNUTLS_MAC_SHA1, GNUTLS_TLS1,
GNUTLS_VERSION_MAX, 1),
-#endif
GNUTLS_CIPHER_SUITE_ENTRY (GNUTLS_RSA_AES_128_CBC_SHA256,
GNUTLS_CIPHER_AES_128_CBC, GNUTLS_KX_RSA,
GNUTLS_MAC_SHA256, GNUTLS_TLS1_2,
diff --git a/lib/gcrypt/cipher.c b/lib/gcrypt/cipher.c
index 965d8db..4b3a50c 100644
--- a/lib/gcrypt/cipher.c
+++ b/lib/gcrypt/cipher.c
@@ -34,6 +34,8 @@
/* Functions that refer to the libgcrypt library.
*/
+#error GCM is missing
+
static int
wrap_gcry_cipher_init (gnutls_cipher_algorithm_t algo, void **ctx)
{
@@ -84,7 +86,6 @@ wrap_gcry_cipher_init (gnutls_cipher_algorithm_t algo, void
**ctx)
GCRY_CIPHER_MODE_CBC, 0);
break;
-#ifdef ENABLE_CAMELLIA
case GNUTLS_CIPHER_CAMELLIA_128_CBC:
err =
gcry_cipher_open ((gcry_cipher_hd_t *) ctx, GCRY_CIPHER_CAMELLIA128,
@@ -96,7 +97,6 @@ wrap_gcry_cipher_init (gnutls_cipher_algorithm_t algo, void
**ctx)
gcry_cipher_open ((gcry_cipher_hd_t *) ctx, GCRY_CIPHER_CAMELLIA256,
GCRY_CIPHER_MODE_CBC, 0);
break;
-#endif
default:
gnutls_assert ();
return GNUTLS_E_INVALID_REQUEST;
diff --git a/lib/gcrypt/pk.c b/lib/gcrypt/pk.c
index e039d9d..e1f8394 100644
--- a/lib/gcrypt/pk.c
+++ b/lib/gcrypt/pk.c
@@ -27,6 +27,8 @@
* encryption and signatures.
*/
+#error NO ECC SUPPORT
+
#include <gnutls_int.h>
#include <gnutls_mpi.h>
#include <gnutls_pk.h>
diff --git a/lib/gnutls_global.h b/lib/gnutls_global.h
index affd1fa..2fbb06a 100644
--- a/lib/gnutls_global.h
+++ b/lib/gnutls_global.h
@@ -45,5 +45,6 @@ extern gnutls_log_func _gnutls_log_func;
extern gnutls_audit_log_func _gnutls_audit_log_func;
extern int _gnutls_log_level;
extern int gnutls_crypto_init (void);
+void _gnutls_priority_prefer_aes_gcm(void);
#endif
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 9500ea0..9a40d12 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -298,41 +298,74 @@ static const int kx_priority_secure[] = {
0
};
-static const int cipher_priority_performance[] = {
+static const int cipher_priority_performance_sw[] = {
GNUTLS_CIPHER_ARCFOUR_128,
- GNUTLS_CIPHER_CAMELLIA_128_CBC,
GNUTLS_CIPHER_AES_128_CBC,
- GNUTLS_CIPHER_3DES_CBC,
+ GNUTLS_CIPHER_CAMELLIA_128_CBC,
GNUTLS_CIPHER_AES_256_CBC,
GNUTLS_CIPHER_CAMELLIA_256_CBC,
+ GNUTLS_CIPHER_3DES_CBC,
GNUTLS_CIPHER_AES_128_GCM,
GNUTLS_CIPHER_AES_256_GCM,
0
};
-static const int cipher_priority_suiteb128[] = {
+/* If GCM and AES acceleration is available then prefer
+ * them over anything else.
+ */
+static const int cipher_priority_performance_hw_aes[] = {
GNUTLS_CIPHER_AES_128_GCM,
GNUTLS_CIPHER_AES_128_CBC,
- 0
-};
-
-static const int cipher_priority_suiteb192[] = {
GNUTLS_CIPHER_AES_256_GCM,
GNUTLS_CIPHER_AES_256_CBC,
+ GNUTLS_CIPHER_ARCFOUR_128,
+ GNUTLS_CIPHER_CAMELLIA_128_CBC,
+ GNUTLS_CIPHER_CAMELLIA_256_CBC,
+ GNUTLS_CIPHER_3DES_CBC,
0
};
-static const int cipher_priority_normal[] = {
+static const int cipher_priority_normal_sw[] = {
GNUTLS_CIPHER_AES_128_CBC,
GNUTLS_CIPHER_CAMELLIA_128_CBC,
+ GNUTLS_CIPHER_AES_128_GCM,
GNUTLS_CIPHER_AES_256_CBC,
GNUTLS_CIPHER_CAMELLIA_256_CBC,
+ GNUTLS_CIPHER_AES_256_GCM,
+ GNUTLS_CIPHER_3DES_CBC,
+ GNUTLS_CIPHER_ARCFOUR_128,
+ 0
+};
+
+static const int cipher_priority_normal_hw_aes[] = {
GNUTLS_CIPHER_AES_128_GCM,
+ GNUTLS_CIPHER_AES_128_CBC,
+ GNUTLS_CIPHER_AES_256_GCM,
+ GNUTLS_CIPHER_AES_256_CBC,
+ GNUTLS_CIPHER_CAMELLIA_128_CBC,
+ GNUTLS_CIPHER_CAMELLIA_256_CBC,
GNUTLS_CIPHER_3DES_CBC,
GNUTLS_CIPHER_ARCFOUR_128,
0
};
+static const int *cipher_priority_performance = cipher_priority_performance_sw;
+static const int *cipher_priority_normal = cipher_priority_normal_sw;
+
+
+static const int cipher_priority_suiteb128[] = {
+ GNUTLS_CIPHER_AES_128_GCM,
+ GNUTLS_CIPHER_AES_128_CBC,
+ 0
+};
+
+static const int cipher_priority_suiteb192[] = {
+ GNUTLS_CIPHER_AES_256_GCM,
+ GNUTLS_CIPHER_AES_256_CBC,
+ 0
+};
+
+
static const int cipher_priority_secure128[] = {
GNUTLS_CIPHER_AES_128_CBC,
GNUTLS_CIPHER_CAMELLIA_128_CBC,
@@ -1068,3 +1101,12 @@ gnutls_set_default_export_priority (gnutls_session_t
session)
{
return gnutls_priority_set_direct (session, "EXPORT", NULL);
}
+
+/* Increases the priority of AES-GCM as it is much faster
+ * than anything else if hardware support is there.
+ */
+void _gnutls_priority_prefer_aes_gcm(void)
+{
+ cipher_priority_performance = cipher_priority_performance_hw_aes;
+ cipher_priority_normal = cipher_priority_normal_hw_aes;
+}
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index 9c8d126..46e8c8f 100644
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -35,9 +35,7 @@
#include <nettle/des.h>
#include <nettle/nettle-meta.h>
#include <nettle/cbc.h>
-# ifdef NETTLE_GCM
#include <nettle/gcm.h>
-# endif
/* Functions that refer to the libgcrypt library.
*/
@@ -128,9 +126,7 @@ struct nettle_cipher_ctx
struct arctwo_ctx arctwo;
struct des3_ctx des3;
struct des_ctx des;
-#ifdef NETTLE_GCM
struct gcm_aes_ctx aes_gcm;
-#endif
} ctx;
void *ctx_ptr;
uint8_t iv[MAX_BLOCK_SIZE];
@@ -144,7 +140,6 @@ struct nettle_cipher_ctx
tag_func tag;
};
-#ifdef NETTLE_GCM
#define GCM_DEFAULT_NONCE_SIZE 12
static void _gcm_encrypt(void *_ctx, nettle_crypt_func f,
@@ -163,8 +158,6 @@ static void _gcm_decrypt(void *_ctx, nettle_crypt_func f,
return gcm_aes_decrypt(_ctx, length, dst, src);
}
-#endif
-
static int
wrap_nettle_cipher_init (gnutls_cipher_algorithm_t algo, void **_ctx)
{
@@ -181,7 +174,6 @@ wrap_nettle_cipher_init (gnutls_cipher_algorithm_t algo,
void **_ctx)
switch (algo)
{
-#ifdef NETTLE_GCM
case GNUTLS_CIPHER_AES_128_GCM:
case GNUTLS_CIPHER_AES_256_GCM:
ctx->encrypt = _gcm_encrypt;
@@ -192,7 +184,6 @@ wrap_nettle_cipher_init (gnutls_cipher_algorithm_t algo,
void **_ctx)
ctx->ctx_ptr = &ctx->ctx.aes_gcm;
ctx->block_size = AES_BLOCK_SIZE;
break;
-#endif
case GNUTLS_CIPHER_CAMELLIA_128_CBC:
case GNUTLS_CIPHER_CAMELLIA_256_CBC:
ctx->encrypt = cbc_encrypt;
@@ -263,12 +254,10 @@ wrap_nettle_cipher_setkey (void *_ctx, const void *key,
size_t keysize)
switch (ctx->algo)
{
-#ifdef NETTLE_GCM
case GNUTLS_CIPHER_AES_128_GCM:
case GNUTLS_CIPHER_AES_256_GCM:
gcm_aes_set_key(&ctx->ctx.aes_gcm, keysize, key);
break;
-#endif
case GNUTLS_CIPHER_AES_128_CBC:
case GNUTLS_CIPHER_AES_192_CBC:
case GNUTLS_CIPHER_AES_256_CBC:
@@ -331,7 +320,6 @@ struct nettle_cipher_ctx *ctx = _ctx;
switch (ctx->algo)
{
-#ifdef NETTLE_GCM
case GNUTLS_CIPHER_AES_128_GCM:
case GNUTLS_CIPHER_AES_256_GCM:
if (ivsize != GCM_DEFAULT_NONCE_SIZE)
@@ -342,7 +330,6 @@ struct nettle_cipher_ctx *ctx = _ctx;
gcm_aes_set_iv(&ctx->ctx.aes_gcm, GCM_DEFAULT_NONCE_SIZE, iv);
break;
-#endif
default:
if (ivsize > ctx->block_size)
{
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index bf9a42a..ac36a14 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -80,28 +80,17 @@ dnl fi
AC_MSG_CHECKING([whether to use nettle])
if test "$cryptolib" = "nettle";then
AC_MSG_RESULT(yes)
- AC_LIB_HAVE_LINKFLAGS([nettle],, [#include <nettle/aes.h>],
- [nettle_aes_invert_key (0, 0)])
+ AC_LIB_HAVE_LINKFLAGS([nettle], [hogweed gmp], [#include <nettle/gcm.h>],
+ [gcm_set_iv (0, 0, 0, 0)])
if test "$ac_cv_libnettle" != yes; then
AC_MSG_ERROR([[
***
- *** Libnettle 2.1 was not found.
+ *** Libnettle 2.2 was not found.
]])
fi
- AC_TRY_COMPILE(,
- [
- #include <nettle/gcm.h>
- gcm_set_nonce(0, 0, 0);
- return 0;
- ], [
- AC_DEFINE([NETTLE_GCM], 1, [Nettle supports GCM])
- ], [
- ])
- NETTLE_LIBS="-lgmp -lhogweed"
else
AC_MSG_RESULT(no)
fi
- AC_SUBST(NETTLE_LIBS)
AM_CONDITIONAL(ENABLE_NETTLE, test "$cryptolib" = "nettle")
AC_ARG_WITH(included-libtasn1,
@@ -184,23 +173,6 @@ fi
fi
AM_CONDITIONAL(ENABLE_ANON, test "$ac_enable_anon" != "no")
- # Allow disabling Camellia
- if test "$nettle" != "yes";then
- AC_ARG_ENABLE(camellia,
- AS_HELP_STRING([--disable-camellia], [disable Camellia cipher]),
- enable_camellia=$enableval, enable_camellia=yes)
- else
- enable_camellia=no
- fi
-
- AC_MSG_CHECKING([whether to disable Camellia cipher])
- if test "$enable_camellia" != "no"; then
- AC_MSG_RESULT([no])
- AC_DEFINE([ENABLE_CAMELLIA], 1, [enable camellia block cipher])
- else
- AC_MSG_RESULT([yes])
- fi
-
AC_MSG_CHECKING([whether to disable extra PKI stuff])
AC_ARG_ENABLE(extra-pki,
AS_HELP_STRING([--disable-extra-pki],
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-71-g5911868,
Nikos Mavrogiannopoulos <=