crypto: unconditionally enable gnutls XTS support

The XTS support required 3.6.8 which is older than our min
required version now.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2025-10-31 15:28:26 +00:00
parent c4b3d0074e
commit 9e6ce4d22e

View file

@ -23,10 +23,6 @@
#include <gnutls/crypto.h> #include <gnutls/crypto.h>
#if GNUTLS_VERSION_NUMBER >= 0x030608
#define QEMU_GNUTLS_XTS
#endif
bool qcrypto_cipher_supports(QCryptoCipherAlgo alg, bool qcrypto_cipher_supports(QCryptoCipherAlgo alg,
QCryptoCipherMode mode) QCryptoCipherMode mode)
{ {
@ -44,7 +40,6 @@ bool qcrypto_cipher_supports(QCryptoCipherAlgo alg,
default: default:
return false; return false;
} }
#ifdef QEMU_GNUTLS_XTS
case QCRYPTO_CIPHER_MODE_XTS: case QCRYPTO_CIPHER_MODE_XTS:
switch (alg) { switch (alg) {
case QCRYPTO_CIPHER_ALGO_AES_128: case QCRYPTO_CIPHER_ALGO_AES_128:
@ -53,7 +48,6 @@ bool qcrypto_cipher_supports(QCryptoCipherAlgo alg,
default: default:
return false; return false;
} }
#endif
default: default:
return false; return false;
} }
@ -241,7 +235,6 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgo alg,
int err; int err;
switch (mode) { switch (mode) {
#ifdef QEMU_GNUTLS_XTS
case QCRYPTO_CIPHER_MODE_XTS: case QCRYPTO_CIPHER_MODE_XTS:
switch (alg) { switch (alg) {
case QCRYPTO_CIPHER_ALGO_AES_128: case QCRYPTO_CIPHER_ALGO_AES_128:
@ -254,7 +247,6 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgo alg,
break; break;
} }
break; break;
#endif
case QCRYPTO_CIPHER_MODE_ECB: case QCRYPTO_CIPHER_MODE_ECB:
case QCRYPTO_CIPHER_MODE_CBC: case QCRYPTO_CIPHER_MODE_CBC: