diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:35:42 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:36:13 +0000 |
commit | 98bb3da708a475ff67dc019fddcb307d18856e5f (patch) | |
tree | b3e34a4af21848ad41adebadc573cf8d39c4a70c /debian/tests/cryptdisks | |
parent | Merging upstream version 2:2.7.0. (diff) | |
download | cryptsetup-98bb3da708a475ff67dc019fddcb307d18856e5f.tar.xz cryptsetup-98bb3da708a475ff67dc019fddcb307d18856e5f.zip |
Merging debian version 2:2.7.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | debian/tests/cryptdisks | 6 | ||||
-rwxr-xr-x | debian/tests/cryptdisks.init | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/tests/cryptdisks b/debian/tests/cryptdisks index 3d3223b..b8c6bcc 100755 --- a/debian/tests/cryptdisks +++ b/debian/tests/cryptdisks @@ -151,7 +151,7 @@ cryptdisks_stop plain_crypt disk_setup cat >/etc/crypttab <<-EOF - sector_crypt $CRYPT_DEV /dev/urandom plain,cipher=aes-cbc-essiv:sha256,size=256,sector-size=4096 + sector_crypt $CRYPT_DEV /dev/urandom plain,cipher=aes-xts-plain64,size=256,sector-size=4096 EOF cryptdisks_start sector_crypt @@ -168,7 +168,7 @@ cryptdisks_stop sector_crypt disk_setup cat /proc/sys/kernel/random/uuid >"$TMPDIR/passphrase" cat >/etc/crypttab <<-EOF - hash_crypt $CRYPT_DEV none plain,cipher=aes-cbc-essiv:sha256,size=256,hash=sha256 + hash_crypt $CRYPT_DEV none plain,cipher=aes-xts-plain64,size=256,hash=sha256 EOF cryptdisks_start hash_crypt </dev/tty & pid=$! @@ -192,7 +192,7 @@ offset=2048 # in 512 byte sectors skip=256 # in 512 byte sectors disk_setup cat >/etc/crypttab <<-EOF - offset_crypt $CRYPT_DEV /dev/urandom plain,cipher=aes-cbc-essiv:sha256,size=256,offset=$offset,skip=$skip + offset_crypt $CRYPT_DEV /dev/urandom plain,cipher=aes-xts-plain64,size=256,offset=$offset,skip=$skip EOF # having an existing file system before the offset has no effect (cf. #994056) diff --git a/debian/tests/cryptdisks.init b/debian/tests/cryptdisks.init index 408c325..2019e03 100755 --- a/debian/tests/cryptdisks.init +++ b/debian/tests/cryptdisks.init @@ -23,7 +23,7 @@ dmsetup create disk12 <<-EOF $((64 * 2*1024)) $((64 * 2*1024)) linear /dev/mapper/disk2 0 EOF -cipher="aes-cbc-essiv:sha256" +cipher="aes-xts-plain64" size=32 # bytes cat >/etc/crypttab <<-EOF crypt_disk0 /dev/mapper/disk0 /dev/urandom plain,cipher=$cipher,size=$((8*size)) |