Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-09-27 20:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #348 from AlexisDanizan/master

Browse Source 
Bug fix #328
This commit is contained in:
Jaromil 2019-05-05 10:39:16 +02:00 committed by GitHub
commit eec64f4f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tomb
View File

@ -2008,7 +2008,7 @@ lock_tomb_with_key() {
# old default was aes-cbc-essiv:sha256 # old default was aes-cbc-essiv:sha256
# Override with -o # Override with -o
# for more alternatives refer to cryptsetup(8) # for more alternatives refer to cryptsetup(8)
local cipher="aes-xts-plain64:sha256" local cipher="aes-xts-plain64"
local tombpath="$1" # First argument is the path to the tomb local tombpath="$1" # First argument is the path to the tomb
@ -2063,13 +2063,13 @@ lock_tomb_with_key() {
_message "Formatting Luks mapped device." _message "Formatting Luks mapped device."
_cryptsetup --batch-mode \ _cryptsetup --batch-mode \
--cipher ${cipher} --key-size 512 --key-slot 0 \ --cipher ${cipher} --hash sha512 --key-size 512 --key-slot 0 \
luksFormat ${nstloop} luksFormat ${nstloop}
[[ $? == 0 ]] || { [[ $? == 0 ]] || {
_warning "cryptsetup luksFormat returned an error." _warning "cryptsetup luksFormat returned an error."
_failure "Operation aborted." } _failure "Operation aborted." }
_cryptsetup --cipher ${cipher} luksOpen ${nstloop} tomb.tmp _cryptsetup --cipher ${cipher} --hash sha512 luksOpen ${nstloop} tomb.tmp
[[ $? == 0 ]] || { [[ $? == 0 ]] || {
_warning "cryptsetup luksOpen returned an error." _warning "cryptsetup luksOpen returned an error."
_failure "Operation aborted." } _failure "Operation aborted." }