crypto: fix build with nettle >= 3.0.0
commitbecaeb726ae7da4212a788773ebdfe87b4833f5c
authorRadim Krčmář <rkrcmar@redhat.com>
Fri, 10 Jul 2015 17:18:00 +0000 (10 19:18 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 16 Jul 2015 18:00:20 +0000 (16 20:00 +0200)
treec5dceb6b362abb3615edfec2e0c35ab587baf7da
parentc6742b14fe7352059cd4954a356a8105757af31b
crypto: fix build with nettle >= 3.0.0

In nettle 3, cbc_encrypt() accepts 'nettle_cipher_func' instead of
'nettle_crypt_func' and these two differ in 'const' qualifier of the
first argument.  The build fails with:

  In file included from crypto/cipher.c:71:0:
  ./crypto/cipher-nettle.c: In function ‘qcrypto_cipher_encrypt’:
  ./crypto/cipher-nettle.c:154:38: error: passing argument 2 of
  ‘nettle_cbc_encrypt’ from incompatible pointer type
           cbc_encrypt(ctx->ctx_encrypt, ctx->alg_encrypt,
                                               ^
  In file included from ./crypto/cipher-nettle.c:24:0,
                   from crypto/cipher.c:71:
  /usr/include/nettle/cbc.h:48:1: note: expected
  ‘void (*)(const void *, size_t, uint8_t *, const uint8_t *)
  but argument is of type
  ‘void (*)(      void *, size_t, uint8_t *, const uint8_t *)

To allow both versions, we switch to the new definition and #if typedef
it for old versions.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Message-Id: <1436548682-9315-2-git-send-email-rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
configure
crypto/cipher-nettle.c