From 96b6171376bfdb7417143a2026beda059fe3e22f Mon Sep 17 00:00:00 2001

From: Yu Watanabe <watanabe.yu+github@gmail.com>

Date: Sat, 1 Sep 2018 23:47:46 +0900

Subject: [PATCH] cryptsetup: do not define arg_sector_size if libgcrypt is

 v1.x (#9990)

Follow-up for #9936.

(cherry picked from commit 645461f0cf6ec91e5b0b571559fb4cc4898192bc)

Related: #1572563

---

 src/cryptsetup/cryptsetup.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c

index 87008cb969..abeba44ee8 100644

--- a/src/cryptsetup/cryptsetup.c

+++ b/src/cryptsetup/cryptsetup.c

@@ -30,7 +30,9 @@

 static const char *arg_type = NULL; /* ANY_LUKS, CRYPT_LUKS1, CRYPT_LUKS2, CRYPT_TCRYPT or CRYPT_PLAIN */

 static char *arg_cipher = NULL;

 static unsigned arg_key_size = 0;

+#if HAVE_LIBCRYPTSETUP_SECTOR_SIZE

 static unsigned arg_sector_size = CRYPT_SECTOR_SIZE;

+#endif

 static int arg_key_slot = CRYPT_ANY_SLOT;

 static unsigned arg_keyfile_size = 0;

 static uint64_t arg_keyfile_offset = 0;