You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1020 B
30 lines
1020 B
5 years ago
|
From 12151731716c21b8e58f96faff7395454ae609b0 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: #1571801
|
||
|
|
---
|
||
|
|
src/cryptsetup/cryptsetup.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
|
||
|
|
index fd8b9ba9ec..8c69e428a3 100644
|
||
|
|
--- a/src/cryptsetup/cryptsetup.c
|
||
|
|
+++ b/src/cryptsetup/cryptsetup.c
|
||
|
|
@@ -50,7 +50,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 unsigned arg_keyfile_offset = 0;
|