On Thu, Jul 16, 2015 at 06:03:59PM +0200, Radim Krčmář wrote: > 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ář <rkrc...@redhat.com> > --- > v3: no change > v2: fix typo in crypto > > configure | 4 +++- > crypto/cipher-nettle.c | 16 ++++++++++------ > 2 files changed, 13 insertions(+), 7 deletions(-)
Reviewed-by: Daniel P. Berrange <berra...@redhat.com> Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
