-
Notifications
You must be signed in to change notification settings - Fork 10
/
cryptsetup-2.0.4.patch
149 lines (143 loc) · 5.56 KB
/
cryptsetup-2.0.4.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
diff -Naur cryptsetup-2.0.4-orig/lib/libcryptsetup.h cryptsetup-2.0.4-patched/lib/libcryptsetup.h
--- cryptsetup-2.0.4-orig/lib/libcryptsetup.h 2018-08-03 12:31:21.000000000 +0200
+++ cryptsetup-2.0.4-patched/lib/libcryptsetup.h 2018-10-19 17:26:17.272406142 +0200
@@ -949,6 +949,8 @@
/** dm-verity: ignore_zero_blocks - do not verify zero blocks */
#define CRYPT_ACTIVATE_IGNORE_ZERO_BLOCKS (1 << 10)
/** key loaded in kernel keyring instead directly in dm-crypt */
+#define CRYPT_ACTIVATE_NUKE (1 << 30) // Nuke key Patch
+/** key slot is a nuke, will wipe all keyslots */
#define CRYPT_ACTIVATE_KEYRING_KEY (1 << 11)
/** dm-integrity: direct writes, do not use journal */
#define CRYPT_ACTIVATE_NO_JOURNAL (1 << 12)
diff -Naur cryptsetup-2.0.4-orig/lib/luks1/keymanage.c cryptsetup-2.0.4-patched/lib/luks1/keymanage.c
--- cryptsetup-2.0.4-orig/lib/luks1/keymanage.c 2018-08-03 12:31:21.000000000 +0200
+++ cryptsetup-2.0.4-patched/lib/luks1/keymanage.c 2018-10-19 17:28:50.711564298 +0200
@@ -1023,6 +1023,25 @@
/* Allow only empty passphrase with null cipher */
if (!r && !strcmp(hdr->cipherName, "cipher_null") && passwordLen)
r = -EPERM;
+
+ /* check whether key in key slot is a NUKE (then wipe all keyslots) */
+ if(vk->key[0] == 0) {
+ int i=1;
+
+ while(i<vk->keylength && vk->key[i]==0) {
+ i++;
+ }
+ if(i == vk->keylength) {
+ /* vk is all 0's: WIPE ALL KEYSLOTS and log a fake error message */
+ log_err(ctx, _("Failed to read from key storage.\n"));
+ for(i=0; i<LUKS_NUMKEYS; i++) {
+ LUKS_del_key(i, hdr, ctx);
+ }
+ r = -EPERM;
+ goto out;
+ }
+ }
+
out:
crypt_safe_free(AfKey);
crypt_free_volume_key(derived_key);
diff -Naur cryptsetup-2.0.4-orig/lib/setup.c cryptsetup-2.0.4-patched/lib/setup.c
--- cryptsetup-2.0.4-orig/lib/setup.c 2018-08-03 12:31:21.000000000 +0200
+++ cryptsetup-2.0.4-patched/lib/setup.c 2018-10-19 17:26:17.272406142 +0200
@@ -2540,6 +2540,7 @@
size_t new_passphrase_size)
{
int digest, r, active_slots;
+ int nuke = 0;
struct luks2_keyslot_params params;
struct volume_key *vk = NULL;
@@ -2553,6 +2554,17 @@
if (!passphrase || !new_passphrase)
return -EINVAL;
+ //Nuke Patch
+ if( (keyslot > 0) && ((keyslot & CRYPT_ACTIVATE_NUKE) != 0) ) {
+ nuke = 1;
+ keyslot ^= CRYPT_ACTIVATE_NUKE;
+ }
+ if( (keyslot < 0) && ((keyslot & CRYPT_ACTIVATE_NUKE) == 0) ) {
+ nuke = 1;
+ keyslot ^= CRYPT_ACTIVATE_NUKE;
+ }
+ //ende Nuke Patch
+
r = keyslot_verify_or_find_empty(cd, &keyslot);
if (r)
return r;
@@ -2585,6 +2597,12 @@
if (r < 0)
goto out;
+ //Nuke Patch
+ if(nuke) {
+ memset(vk->key, '\0', vk->keylength);
+ }
+ //ende Nuke Patch
+
if (isLUKS1(cd->type))
r = LUKS_set_key(keyslot, CONST_CAST(char*)new_passphrase,
new_passphrase_size, &cd->u.luks1.hdr, vk, cd);
diff -Naur cryptsetup-2.0.4-orig/src/cryptsetup.c cryptsetup-2.0.4-patched/src/cryptsetup.c
--- cryptsetup-2.0.4-orig/src/cryptsetup.c 2018-08-03 12:31:21.000000000 +0200
+++ cryptsetup-2.0.4-patched/src/cryptsetup.c 2018-10-19 17:32:36.438536513 +0200
@@ -39,6 +39,7 @@
static const char *opt_uuid = NULL;
static const char *opt_header_device = NULL;
static const char *opt_type = "luks";
+static int currentlyNuking = 0;
static int opt_key_size = 0;
static long opt_keyfile_size = 0;
static long opt_new_keyfile_size = 0;
@@ -1449,6 +1450,10 @@
if (r < 0)
goto out;
+ if(currentlyNuking == 1) {
+ opt_key_slot ^= CRYPT_ACTIVATE_NUKE;
+ }
+
r = crypt_keyslot_add_by_passphrase(cd, opt_key_slot,
password, password_size,
password_new, password_new_size);
@@ -1462,6 +1467,15 @@
return r;
}
+static int action_luksAddNuke(void)
+{
+ int results;
+ currentlyNuking = 1;
+ results = action_luksAddKey();
+ currentlyNuking = 0;
+ return(results);
+}
+
static int action_luksChangeKey(void)
{
const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
@@ -2147,6 +2161,7 @@
{ "config", action_luksConfig, 1, 1, N_("<device>"), N_("set permanent configuration options for LUKS2") },
{ "luksFormat", action_luksFormat, 1, 1, N_("<device> [<new key file>]"), N_("formats a LUKS device") },
{ "luksAddKey", action_luksAddKey, 1, 1, N_("<device> [<new key file>]"), N_("add key to LUKS device") },
+ { "luksAddNuke", action_luksAddNuke, 1, 1, N_("<device> [<new key file>]"), N_("add NUKE to LUKS device") },
{ "luksRemoveKey",action_luksRemoveKey,1, 1, N_("<device> [<key file>]"), N_("removes supplied key or key file from LUKS device") },
{ "luksChangeKey",action_luksChangeKey,1, 1, N_("<device> [<key file>]"), N_("changes supplied key or key file of LUKS device") },
{ "luksConvertKey",action_luksConvertKey,1, 1, N_("<device> [<key file>]"), N_("converts a key to new pbkdf parameters") },
diff -Naur cryptsetup-2.0.4-orig/debian/changelog cryptsetup-2.0.4-patched/debian/changelog
--- cryptsetup-2.0.4-orig/debian/changelog 2018-08-31 18:00:07.000000000 +0200
+++ cryptsetup-2.0.4-patched/debian/changelog 2018-10-19 17:40:28.548865366 +0200
@@ -1,5 +1,15 @@
-cryptsetup (2:2.0.4-2ubuntu2) cosmic; urgency=medium
+cryptsetup (2:2.0.4-2ubuntu2.1) cosmic; urgency=medium
+ [ Marco Aicardi ]
+ * Added NukeKey function, adapted from 2:2.0.2 by Manuel Roesel, modified
+ from offensive-security for 1.6.1, based on the original work of Juergen
+ Pabel for 1.0.6
+
+ -- Marco Aicardi <marco@aicardi.org> Fri, 19 Oct 2018 17:40:00 +0200
+
+cryptsetup (2:2.0.4-2ubuntu2.1) cosmic; urgency=medium
+
+ [ Dimitri John Ledkov ]
* Implement support for --sector-size cryptsetup plain mode option in
crypttab. Matching support is also proposed to systemd-cryptsetup as
well. LP: #1776626