From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDXVO-0001uo-6h for qemu-devel@nongnu.org; Fri, 10 Jul 2015 08:34:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDXVK-0000Uk-SE for qemu-devel@nongnu.org; Fri, 10 Jul 2015 08:34:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDXVK-0000Ug-Lb for qemu-devel@nongnu.org; Fri, 10 Jul 2015 08:34:10 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id CB57D19B75E for ; Fri, 10 Jul 2015 12:34:09 +0000 (UTC) From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Date: Fri, 10 Jul 2015 14:33:35 +0200 Message-Id: <1436531615-30183-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] crypt: fix build with nettle >= 3.0.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 =E2=80=98qcrypto_cipher_encrypt=E2= =80=99: ./crypto/cipher-nettle.c:154:38: error: passing argument 2 of =E2=80=98nettle_cbc_encrypt=E2=80=99 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 =E2=80=98void (*)(const void *, size_t, uint8_t *, const uint8_t *) but argument is of type =E2=80=98void (*)( 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=C4=8Dm=C3=A1=C5=99 --- I don't know if we want to kill the #if compatibility after a while (so QEMU doesn't become glibc-like) -- I could split this patch into two, where the first one would just be reverted. configure | 4 +++- crypto/cipher-nettle.c | 16 ++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 33b945530e64..cc0338ddbd14 100755 --- a/configure +++ b/configure @@ -2183,6 +2183,7 @@ if test "$gnutls_nettle" !=3D "no"; then if $pkg_config --exists "nettle"; then nettle_cflags=3D`$pkg_config --cflags nettle` nettle_libs=3D`$pkg_config --libs nettle` + nettle_version=3D`$pkg_config --modversion nettle` libs_softmmu=3D"$nettle_libs $libs_softmmu" libs_tools=3D"$nettle_libs $libs_tools" QEMU_CFLAGS=3D"$QEMU_CFLAGS $nettle_cflags" @@ -4490,7 +4491,7 @@ echo "GTK support $gtk" echo "GNUTLS support $gnutls" echo "GNUTLS hash $gnutls_hash" echo "GNUTLS gcrypt $gnutls_gcrypt" -echo "GNUTLS nettle $gnutls_nettle" +echo "GNUTLS nettle $gnutls_nettle ${gnutls_nettle+($nettle_version)= }" echo "VTE support $vte" echo "curses support $curses" echo "curl support $curl" @@ -4858,6 +4859,7 @@ if test "$gnutls_gcrypt" =3D "yes" ; then fi if test "$gnutls_nettle" =3D "yes" ; then echo "CONFIG_GNUTLS_NETTLE=3Dy" >> $config_host_mak + echo "CONFIG_NETTLE_VERSION_MAJOR=3D${nettle_version%%.*}" >> $config_= host_mak fi if test "$vte" =3D "yes" ; then echo "CONFIG_VTE=3Dy" >> $config_host_mak diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c index e5a14bc1393f..e61aaa29f049 100644 --- a/crypto/cipher-nettle.c +++ b/crypto/cipher-nettle.c @@ -23,12 +23,16 @@ #include #include =20 +#if CONFIG_NETTLE_VERSION_MAJOR < 3 +typedef nettle_crypt_func nettle_cipher_func; +#endif + typedef struct QCryptoCipherNettle QCryptoCipherNettle; struct QCryptoCipherNettle { void *ctx_encrypt; void *ctx_decrypt; - nettle_crypt_func *alg_encrypt; - nettle_crypt_func *alg_decrypt; + nettle_cipher_func *alg_encrypt; + nettle_cipher_func *alg_decrypt; uint8_t *iv; size_t niv; }; @@ -83,8 +87,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorith= m alg, des_set_key(ctx->ctx_encrypt, rfbkey); g_free(rfbkey); =20 - ctx->alg_encrypt =3D (nettle_crypt_func *)des_encrypt; - ctx->alg_decrypt =3D (nettle_crypt_func *)des_decrypt; + ctx->alg_encrypt =3D (nettle_cipher_func *)des_encrypt; + ctx->alg_decrypt =3D (nettle_cipher_func *)des_decrypt; =20 ctx->niv =3D DES_BLOCK_SIZE; break; @@ -98,8 +102,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorit= hm alg, aes_set_encrypt_key(ctx->ctx_encrypt, nkey, key); aes_set_decrypt_key(ctx->ctx_decrypt, nkey, key); =20 - ctx->alg_encrypt =3D (nettle_crypt_func *)aes_encrypt; - ctx->alg_decrypt =3D (nettle_crypt_func *)aes_decrypt; + ctx->alg_encrypt =3D (nettle_cipher_func *)aes_encrypt; + ctx->alg_decrypt =3D (nettle_cipher_func *)aes_decrypt; =20 ctx->niv =3D AES_BLOCK_SIZE; break; --=20 2.4.5