diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-05-29 12:22:56 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-05-29 12:22:56 +0200 |
| commit | 91f87327912d28adab2b52fb0549a134b9a2d83d (patch) | |
| tree | 229fba5e831c6ccce55c6f42de41a157a4737207 | |
| parent | c5136509c44551fccba18b364d223a1db9335db5 (diff) | |
| download | gnutls-91f87327912d28adab2b52fb0549a134b9a2d83d.tar.gz | |
Fixed nettle detection and AES.
| -rw-r--r-- | lib/m4/hooks.m4 | 2 | ||||
| -rw-r--r-- | lib/nettle/cipher.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index ddac5f8c0b..854cdcb79e 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -45,7 +45,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS], nettle=no) if test "$nettle" = "yes"; then AC_LIB_HAVE_LINKFLAGS([nettle],, [#include <nettle/aes.h>], - [aes_set_key (0, 0, 0)]) + [aes_set_encrypt_key (0, 0, 0)]) if test "$ac_cv_libnettle" != yes; then nettle=yes AC_MSG_WARN([[ diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c index d1338f2522..75a39993ee 100644 --- a/lib/nettle/cipher.c +++ b/lib/nettle/cipher.c @@ -171,7 +171,7 @@ wrap_nettle_cipher_setkey (void *_ctx, const void *key, size_t keysize) case GNUTLS_CIPHER_AES_128_CBC: case GNUTLS_CIPHER_AES_192_CBC: case GNUTLS_CIPHER_AES_256_CBC: - aes_bidi_setkey(&ctx->ctx_ptr, keysize, key); + aes_bidi_setkey(ctx->ctx_ptr, keysize, key); break; case GNUTLS_CIPHER_3DES_CBC: /* why do we have to deal with parity *@$(*$# */ |