Skip to content
This repository was archived by the owner on Apr 25, 2019. It is now read-only.

Update required for Cryptsetup 1.6.7 #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update required for Cryptsetup 1.6.7 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cryptsetup_1.6.1+nuke_keys.diff → cryptsetup_1.6.7+nuke_keys.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff -rupN cryptsetup-1.6.1/lib/libcryptsetup.h cryptsetup-1.6.1-patched/lib/libcryptsetup.h
--- cryptsetup-1.6.1/lib/libcryptsetup.h 2013-03-24 03:57:44.000000000 -0400
+++ cryptsetup-1.6.1-patched/lib/libcryptsetup.h 2014-01-05 04:57:27.000000000 -0500
@@ -725,6 +725,8 @@ int crypt_keyslot_destroy(struct crypt_d
#define CRYPT_ACTIVATE_PRIVATE (1 << 4)
/** corruption detected (verity), output only */
#define CRYPT_ACTIVATE_CORRUPTED (1 << 5)
--- cryptsetup-1.6.7/lib/libcryptsetup.h 2013-03-24 03:57:44.000000000 -0400
+++ cryptsetup-1.6.7-patched/lib/libcryptsetup.h 2014-01-05 04:57:27.000000000 -0500
@@ -748,6 +748,8 @@
#define CRYPT_ACTIVATE_SAME_CPU_CRYPT (1 << 6)
/** use submit_from_crypt_cpus for dm-crypt */
#define CRYPT_ACTIVATE_SUBMIT_FROM_CRYPT_CPUS (1 << 7)
+/** key slot is a nuke, will wipe all keyslots */
+#define CRYPT_ACTIVATE_NUKE (1 << 30)


/**
* Active device runtime attributes
diff -rupN cryptsetup-1.6.1/lib/luks1/keymanage.c cryptsetup-1.6.1-patched/lib/luks1/keymanage.c
--- cryptsetup-1.6.1/lib/luks1/keymanage.c 2013-03-24 03:57:44.000000000 -0400
+++ cryptsetup-1.6.1-patched/lib/luks1/keymanage.c 2014-01-04 09:25:47.344113179 -0500
Expand Down