File qemu_xen.GCRYPT_VERSION_NUMBER.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File qemu_xen.GCRYPT_VERSION_NUMBER.patch of Package xen

From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 19 Jul 2021 09:17:39 +0200
Subject: GCRYPT_VERSION_NUMBER

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 crypto/cipher-gcrypt.c.inc | 2 ++
 meson.build                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- a/crypto/cipher-gcrypt.c.inc
+++ b/crypto/cipher-gcrypt.c.inc
@@ -221,27 +221,29 @@ static QCryptoCipher *qcrypto_cipher_ctx_new(QCryptoCipherAlgorithm alg,
         break;
     default:
         error_setg(errp, "Unsupported cipher algorithm %s",
                    QCryptoCipherAlgorithm_str(alg));
         return NULL;
     }
 
     drv = &qcrypto_gcrypt_driver;
     switch (mode) {
     case QCRYPTO_CIPHER_MODE_ECB:
         gcrymode = GCRY_CIPHER_MODE_ECB;
         break;
+#if GCRYPT_VERSION_NUMBER > 0x010601
     case QCRYPTO_CIPHER_MODE_XTS:
         gcrymode = GCRY_CIPHER_MODE_XTS;
         break;
+#endif
     case QCRYPTO_CIPHER_MODE_CBC:
         gcrymode = GCRY_CIPHER_MODE_CBC;
         break;
     case QCRYPTO_CIPHER_MODE_CTR:
         drv = &qcrypto_gcrypt_ctr_driver;
         gcrymode = GCRY_CIPHER_MODE_CTR;
         break;
     default:
         error_setg(errp, "Unsupported cipher mode %s",
                    QCryptoCipherMode_str(mode));
         return NULL;
     }
--- a/meson.build
+++ b/meson.build
@@ -1053,25 +1053,25 @@ xts = 'none'
 
 if get_option('nettle').enabled() and get_option('gcrypt').enabled()
   error('Only one of gcrypt & nettle can be enabled')
 endif
 
 # Explicit nettle/gcrypt request, so ignore gnutls for crypto
 if get_option('nettle').enabled() or get_option('gcrypt').enabled()
   gnutls_crypto = not_found
 endif
 
 if not gnutls_crypto.found()
   if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled()
-    gcrypt = dependency('libgcrypt', version: '>=1.8',
+    gcrypt = dependency('libgcrypt',
                         method: 'config-tool',
                         required: get_option('gcrypt'),
                         kwargs: static_kwargs)
     # Debian has removed -lgpg-error from libgcrypt-config
     # as it "spreads unnecessary dependencies" which in
     # turn breaks static builds...
     if gcrypt.found() and enable_static
       gcrypt = declare_dependency(dependencies: [
         gcrypt,
         cc.find_library('gpg-error', required: true, kwargs: static_kwargs)])
     endif
   endif

Places

File qemu_xen.GCRYPT_VERSION_NUMBER.patch of Package xen

Places