diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | crypto/cipher-nettle.c | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/configure b/configure index 33b945530e..cc0338ddbd 100755 --- a/configure +++ b/configure @@ -2183,6 +2183,7 @@ if test "$gnutls_nettle" != "no"; then if $pkg_config --exists "nettle"; then nettle_cflags=`$pkg_config --cflags nettle` nettle_libs=`$pkg_config --libs nettle` + nettle_version=`$pkg_config --modversion nettle` libs_softmmu="$nettle_libs $libs_softmmu" libs_tools="$nettle_libs $libs_tools" QEMU_CFLAGS="$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" = "yes" ; then fi if test "$gnutls_nettle" = "yes" ; then echo "CONFIG_GNUTLS_NETTLE=y" >> $config_host_mak + echo "CONFIG_NETTLE_VERSION_MAJOR=${nettle_version%%.*}" >> $config_host_mak fi if test "$vte" = "yes" ; then echo "CONFIG_VTE=y" >> $config_host_mak diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c index e5a14bc139..e61aaa29f0 100644 --- a/crypto/cipher-nettle.c +++ b/crypto/cipher-nettle.c @@ -23,12 +23,16 @@ #include <nettle/des.h> #include <nettle/cbc.h> +#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(QCryptoCipherAlgorithm alg, des_set_key(ctx->ctx_encrypt, rfbkey); g_free(rfbkey); - ctx->alg_encrypt = (nettle_crypt_func *)des_encrypt; - ctx->alg_decrypt = (nettle_crypt_func *)des_decrypt; + ctx->alg_encrypt = (nettle_cipher_func *)des_encrypt; + ctx->alg_decrypt = (nettle_cipher_func *)des_decrypt; ctx->niv = DES_BLOCK_SIZE; break; @@ -98,8 +102,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, aes_set_encrypt_key(ctx->ctx_encrypt, nkey, key); aes_set_decrypt_key(ctx->ctx_decrypt, nkey, key); - ctx->alg_encrypt = (nettle_crypt_func *)aes_encrypt; - ctx->alg_decrypt = (nettle_crypt_func *)aes_decrypt; + ctx->alg_encrypt = (nettle_cipher_func *)aes_encrypt; + ctx->alg_decrypt = (nettle_cipher_func *)aes_decrypt; ctx->niv = AES_BLOCK_SIZE; break; |