diff --git a/AUTHORS b/AUTHORS index 3aadec8..bdcf767 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,6 +24,7 @@ very helpful in testing and improving cryptmount: Rennie deGraaf (tracing pathname canonicalization issues) Daniel Grund (tracing cmstatus-corruption vulnerability) Jens Guenther (improving compatibility with cryptsetup-2.x) + Helge Kreutzmann (updating German translations) Holger Müller (RH spec-file, Makefile.in patches, LARGEFILE testing) Björn Nilsson (suggestions for /dev/disk/by-id in documentation) Dan O'Huiginn (patch for Debian examples directory) diff --git a/ChangeLog b/ChangeLog index 6561ac0..afcbb62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ ChangeLog for cryptmount (http://cryptmount.sourceforge.net) +27Dec20 - Incorporated updated German translations from Helge Kreutzmann + +06Sep20 - Refreshed cipher-mode and loop-device selection in "mudslinger" testing script + 16Nov19 - Refined handling of passwords in "mudslinger" testing script 06Oct19 - Improved documentation of default values in cmtab manual page diff --git a/README.md b/README.md index 9dac71a..55ecda2 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ to the protected filesystems: * libcryptsetup (version 1.6 or later) * libgcrypt (e.g. version 1.6.0 or later) + * pkg-config You will also need to ensure that your system has support for the loopback and device-mapper devices, which may require loading diff --git a/RELNOTES b/RELNOTES index ccbac89..29d7dc6 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,6 +1,6 @@ - Release notes for cryptmount-5.3.2 + Release notes for cryptmount-5.3.3 - RW Penney, November 2019 + RW Penney, December 2020 Introduction ============ @@ -38,21 +38,21 @@ This (stable) release offers the following enhancements: It has been tested on the following systems: - * Arch Linux (mid-Nov-2019) (x86_64) + * Arch Linux (late-Dec-2020) (x86_64) - * CentOS 8.0.1905 (x86_64) + * CentOS 8.3.2011 (x86_64) - * Debian GNU/Linux 11.x ("bullseye"/"testing", mid_Nov-2019) (x86) + * Debian GNU/Linux 11.x ("bullseye"/"testing", late-Dec-2020) (amd64) - * Debian GNU/Linux 10.2 ("buster") (amd64, x86) + * Debian GNU/Linux 10.7 ("buster") (amd64, x86) - * Debian GNU/Linux 9.11 ("stretch") (x86) + * Debian GNU/Linux 9.13 ("stretch") (x86) - * Debian GNU/Linux 8.11 ("jessie") (x86) + * Fedora 33 (x86_64) - * Gentoo (mid-Nov-2019) (x86) + * Gentoo (late-Dec-2020) (x86) - * Ubuntu 19.10 ("eoan") (x86_64) + * Ubuntu 20.10 ("groovy") (x86_64) Summary of new features in cryptmount-5.2 diff --git a/armour-builtin.c b/armour-builtin.c index 0baf0bc..912e42c 100644 --- a/armour-builtin.c +++ b/armour-builtin.c @@ -1,6 +1,6 @@ /* * Methods for encryption/security mechanisms for cryptmount - * (C)Copyright 2007-2019, RW Penney + * (C)Copyright 2007-2021, RW Penney */ /* @@ -517,5 +517,5 @@ keymanager_t *kmblti_gethandle(void) /** @} */ /* - * (C)Copyright 2007-2019, RW Penney + * (C)Copyright 2007-2021, RW Penney */ diff --git a/armour-gcry.c b/armour-gcry.c index 388cb14..70a842b 100644 --- a/armour-gcry.c +++ b/armour-gcry.c @@ -1,6 +1,6 @@ /* * Methods for encryption/security mechanisms for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -864,5 +864,5 @@ keymanager_t *kmgcry_gethandle() /** @} */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/armour-luks.c b/armour-luks.c index ba46a6c..e3f3bdc 100644 --- a/armour-luks.c +++ b/armour-luks.c @@ -1,6 +1,6 @@ /* * Methods for LUKS-related key-management for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -524,5 +524,5 @@ keymanager_t *kmluks_gethandle() /** @} */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/armour.c b/armour.c index 0befc58..8662c7c 100644 --- a/armour.c +++ b/armour.c @@ -1,6 +1,6 @@ /* * Methods for encryption/security mechanisms for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -862,5 +862,5 @@ int cm_mutex_unlock(void) /** @} */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/armour.h b/armour.h index f67c4fc..0fc7530 100644 --- a/armour.h +++ b/armour.h @@ -1,6 +1,6 @@ /* * Declarations for encryption/security mechanisms for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -139,5 +139,5 @@ int cm_mutex_unlock(void); #endif /* _ARMOUR_H */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/cmtesting.c b/cmtesting.c index 9da7fbb..01d623e 100644 --- a/cmtesting.c +++ b/cmtesting.c @@ -1,6 +1,6 @@ /* * Methods for unit-testing utiltities for cryptmount - * (C)Copyright 2006-2019, RW Penney + * (C)Copyright 2006-2021, RW Penney */ /* @@ -113,5 +113,5 @@ int _keep_ansi_pedantic_quiet = 0; #endif /* TESTING */ /* - * (C)Copyright 2006-2019, RW Penney + * (C)Copyright 2006-2021, RW Penney */ diff --git a/cmtesting.h b/cmtesting.h index 97194d9..700b452 100644 --- a/cmtesting.h +++ b/cmtesting.h @@ -1,6 +1,6 @@ /* * Declarations for unit-test utilities for cryptmoumt - * (C)Copyright 2006-2019, RW Penney + * (C)Copyright 2006-2021, RW Penney */ /* @@ -128,5 +128,5 @@ int cm_run_tests(); #endif /* _CMTEST_H */ /* - * (C)Copyright 2006-2019, RW Penney + * (C)Copyright 2006-2021, RW Penney */ diff --git a/configure.ac b/configure.ac index 3d0a609..ff6da69 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl autoconf script for cryptmount -dnl (C)Copyright 2005-2019, RW Penney +dnl (C)Copyright 2005-2021, RW Penney dnl run 'aclocal; autoconf; automake -a -c -i; ./configure; make' -AC_INIT(cryptmount, 5.3.2, cryptmount@rwpenney.uk) +AC_INIT(cryptmount, 5.3.3, cryptmount@rwpenney.uk) AC_PREREQ(2.59) test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc diff --git a/cryptmount.c b/cryptmount.c index 6c9a733..776f9e9 100644 --- a/cryptmount.c +++ b/cryptmount.c @@ -1,6 +1,6 @@ /* * cryptmount - a utility for user-level mounting of encrypted filesystems - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -169,7 +169,7 @@ int fs_test_blkgetsz() "/dev/hdb", "/dev/hdb1", "/dev/hdb2", "/dev/hdb3", "/dev/sda", "/dev/sda1", "/dev/sda2", "/dev/sda3", "/dev/sdb", "/dev/sdb1", "/dev/sdb2", "/dev/sdb3", - "/dev/xvda", "/dev/xvda1", + "/dev/vda", "/dev/vda1", "/dev/xvda", "/dev/xvda1", "/dev/sr0", "/dev/sr1", NULL }; #endif @@ -1587,5 +1587,5 @@ int main(int argc, char *argv[]) } /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/cryptmount.h b/cryptmount.h index a751736..b5ad6f1 100644 --- a/cryptmount.h +++ b/cryptmount.h @@ -1,6 +1,6 @@ /* * General declarations for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -35,7 +35,7 @@ # if HAVE_STDINT_H # include # else - typedef unsigned short uint8_t; + typedef unsigned char uint8_t; typedef long int32_t; typedef unsigned long uint32_t; typedef long long int64_t; @@ -173,5 +173,5 @@ typedef struct tgtdefn #endif /* _CRYPTMOUNT_H */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/cryptmount.spec b/cryptmount.spec index 9ec8b7e..064cfe5 100644 --- a/cryptmount.spec +++ b/cryptmount.spec @@ -1,10 +1,10 @@ # # rpm spec-file for cryptmount -# Copyright 2006-2019, Holger Mueller, Eriks Zelenka & RW Penney +# Copyright 2006-2021, Holger Mueller, Eriks Zelenka & RW Penney # Summary: Let ordinary users mount an encrypted file system Name: cryptmount -Version: 5.3.2 +Version: 5.3.3 Release: 1%{?dist} License: GPL URL: http://cryptmount.sourceforge.net diff --git a/debian/changelog b/debian/changelog index be5bd92..931a7c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,20 @@ +cryptmount (5.3.3-1) unstable; urgency=low + + * New upstream release + - -Updated German translations (Closes: bug#978114) + + * Updated to Debian Standards Version 4.5.1 + + -- RW Penney Sat, 02 Jan 2021 08:00:00 +0000 + cryptmount (5.3.2-1) unstable; urgency=low * New upstream release - various documentation cleanups - fixed (benign) memory leak + * Updated to Debian Standards Version 4.4.1 + -- RW Penney Sun, 17 Nov 2019 16:20:00 +0000 cryptmount (5.3.1-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index f599e28..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/debian/control b/debian/control index dfbf73d..753c6f1 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: admin Priority: optional Maintainer: RW Penney Homepage: http://cryptmount.sourceforge.net -Build-Depends: automake, debhelper (>= 10), libcryptsetup-dev (>= 1.6), +Build-Depends: automake, debhelper (>= 12), libcryptsetup-dev (>= 1.6), libdevmapper-dev, libgcrypt20-dev (>= 1.5), pkg-config Rules-Requires-Root: binary-targets -Standards-Version: 4.4.1 +Standards-Version: 4.5.1 Package: cryptmount Architecture: linux-any diff --git a/debian/copyright b/debian/copyright index dc76c1d..eb580df 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Source: https://www.sourceforge.net/projects/cryptmount License: GPL-2+ Files: * -Copyright: (C) 2005 - 2019 RW Penney +Copyright: (C) 2005 - 2021 RW Penney License: GPL-2+ Files: blowfish.c blowfish.h diff --git a/debian/cryptmount.lintian-overrides b/debian/cryptmount.lintian-overrides index 698a82d..dfe01d6 100644 --- a/debian/cryptmount.lintian-overrides +++ b/debian/cryptmount.lintian-overrides @@ -1,4 +1,4 @@ # lintian-override for cryptmount -# cryptmount needs to have setuid privileges to be usable by ordinary users: +# cryptmount needs to have setuid privileges to be usable by ordinary users cryptmount: setuid-binary usr/bin/cryptmount 4755 root/root diff --git a/debian/rules b/debian/rules index 7bd8a29..1e13f11 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf,systemd + dh $@ .PHONY: override_dh_auto_configure override_dh_fixperms diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..6cf7708 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,3 @@ +Reference: + Author: RW Penney + URL: http://www.rwpenney.uk/software/index.html#cryptmount diff --git a/delegates.h.in b/delegates.h.in index 21dcf1f..4cdc6cd 100644 --- a/delegates.h.in +++ b/delegates.h.in @@ -1,6 +1,6 @@ /* * Delegation-related declations for cryptmount - * (C)Copyright 2006-2019, RW Penney + * (C)Copyright 2006-2021, RW Penney */ /* @@ -70,5 +70,5 @@ #endif /* _DELEGATES_H */ /* - * (C)Copyright 2006-2019, RW Penney + * (C)Copyright 2006-2021, RW Penney */ diff --git a/dmutils.c b/dmutils.c index b06fac0..ee2b3d1 100644 --- a/dmutils.c +++ b/dmutils.c @@ -1,6 +1,6 @@ /* * Device-mapper utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -275,7 +275,7 @@ int udev_settle() #if HAVE_LIBUDEV udev_ctx = udev_new(); - udev_selinux_init(udev_ctx); + //udev_selinux_init(udev_ctx); udev_qu = udev_queue_new(udev_ctx); #endif @@ -319,7 +319,7 @@ int udev_settle() #if HAVE_LIBUDEV udev_queue_unref(udev_qu); - udev_selinux_exit(udev_ctx); + //udev_selinux_exit(udev_ctx); udev_unref(udev_ctx); #endif @@ -377,5 +377,5 @@ int udev_active_dir(const char *path, time_t starttime, double timeout) } /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/dmutils.h b/dmutils.h index 53ff8f9..dc6af4b 100644 --- a/dmutils.h +++ b/dmutils.h @@ -1,6 +1,6 @@ /* * Declarations for device-mapper utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -47,5 +47,5 @@ int udev_settle(); #endif /* _DMUTILS_H */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/doxyfront.txt b/doxyfront.txt index 3546342..4a0703d 100644 --- a/doxyfront.txt +++ b/doxyfront.txt @@ -1,6 +1,6 @@ /* * Doxygen introductory sections for cryptmount - * (C)Copyright 2012-2014, RW Penney + * (C)Copyright 2012-2020, RW Penney */ /*! \mainpage Cryptmount source documentation diff --git a/fsutils.c b/fsutils.c index eaddb43..3d9737d 100644 --- a/fsutils.c +++ b/fsutils.c @@ -1,6 +1,6 @@ /* * Filesystem-related utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -719,5 +719,5 @@ int fs_test_entropy() #endif /* TESTING */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/fsutils.h b/fsutils.h index 5923347..754ba34 100644 --- a/fsutils.h +++ b/fsutils.h @@ -1,6 +1,6 @@ /* * Declarations for filesytem-related utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -44,5 +44,5 @@ double fs_entropy(const char *dev, const size_t blklen); #endif /* _FSUTILS_H */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/looputils.c b/looputils.c index 014cda8..60342d3 100644 --- a/looputils.c +++ b/looputils.c @@ -1,6 +1,6 @@ /* * Loopback-device utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -302,5 +302,5 @@ int unblockify_file(const char **devname, int isloop) } /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/looputils.h b/looputils.h index 52b527b..4359c7f 100644 --- a/looputils.h +++ b/looputils.h @@ -1,6 +1,6 @@ /* * Declarations for loopback-device utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -45,5 +45,5 @@ int unblockify_file(const char **devname, int isloop); #endif /* _LOOPUTILS_H */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/man/cmtab.5.in b/man/cmtab.5.in index d0a50a9..5567132 100644 --- a/man/cmtab.5.in +++ b/man/cmtab.5.in @@ -1,5 +1,5 @@ .\" cmtab (cryptmount) manual page -.\" Copyright (c) 2005-2019 RW Penney +.\" Copyright (c) 2005-2021 RW Penney .\" .\" ---- macro definitions ---- @@ -31,9 +31,9 @@ describing where that filesystem is stored, and how it is encrypted. The format of the cmtab is flexible, with the description of each target being delimited by braces, parameters being specified by KEY=VALUE pairs, and white-space being freely usable. -Comments are prefixed by a `#' character, and can start at any point in a line, +Comments are prefixed by a \(aq#' character, and can start at any point in a line, lasting to the end of the line. -The backslash character `\\' can be used to ignore any special significance +The backslash character \(aq\\' can be used to ignore any special significance of the following character, for example to include a space in a filename. @CM_SYSCONF_DIR@/cmtab contains entries of the following form: @@ -62,13 +62,13 @@ of the following character, for example to include a space in a filename. } .fi -Some fields, such as `dev' and `fstype' are mandatory, +Some fields, such as \(aqdev' and \(aqfstype' are mandatory, although many fields have sensible default values. Depending on the choice of KEYMANAGER, fields such as -`keyhash', `keycipher', `keymaxlen' may need to be set explicitly. +\(aqkeyhash', \(aqkeycipher', \(aqkeymaxlen' may need to be set explicitly. Any field which contains non-numerical values -(e.g. not `startsector', `ivoffset' etc.) +(e.g. not \(aqstartsector', \(aqivoffset' etc.) can contain references to environmental variables of the form $(HOME). The following variables are recognized, all based on the characteristics of the user currently running @@ -538,7 +538,7 @@ but various advanced LUKS features must be accessed through .\" -------------------------------- .SH COPYRIGHT NOTICE .B cryptmount -is Copyright 2005-2019 RW Penney +is Copyright 2005-2021 RW Penney .br and is supplied with NO WARRANTY. Licencing terms are as described in the file "COPYING" diff --git a/man/cryptmount.8.in b/man/cryptmount.8.in index 09eaeae..e650085 100644 --- a/man/cryptmount.8.in +++ b/man/cryptmount.8.in @@ -1,7 +1,7 @@ .\" cryptmount manual page -.\" Copyright (c) 2005-2019 RW Penney +.\" Copyright (c) 2005-2021 RW Penney .\" -.TH CRYPTMOUNT 8 "2019-01-05" "@PACKAGE_VERSION@" "User commands" +.TH CRYPTMOUNT 8 "2020-12-27" "@PACKAGE_VERSION@" "User commands" .SH NAME cryptmount \- mount/unmount/configure an encrypted filesystem @@ -428,7 +428,7 @@ suggestions and bug-reports, via .\" -------------------------------- .SH COPYRIGHT NOTICE .B cryptmount -is Copyright 2005-2019 RW Penney +is Copyright 2005-2021 RW Penney .br and is supplied with NO WARRANTY. Licencing terms are as described in the file "COPYING" diff --git a/man/fr/cmtab.5.in b/man/fr/cmtab.5.in index 938e0bc..5dbf113 100644 --- a/man/fr/cmtab.5.in +++ b/man/fr/cmtab.5.in @@ -33,10 +33,10 @@ o\[`u] le syst\[`e]me de fichiers est contenu, et comment il est chiffr\['e]. Le format du cmtab est souple, et la description de chaque cible est d\['e]limit\['e]e par des accolades, les param\[`e]tres sont sp\['e]cifi\['e]s par les paires CLEF=VALEUR, et on peut mettre autant de caract\[`e]re blanc d'espacement que l'on veut. -Les annotations commencent avec un caract\[`e]re `#', +Les annotations commencent avec un caract\[`e]re \(aq#', qui peut \[^e]tre utilis\['e] \[`a] n'importe quel endroit dans une ligne, et continuent jusqu'\[`a] la fin de cette ligne. -Le caract\[`e]re `\\' indique que +Le caract\[`e]re \(aq\\' indique que si le caract\[`e]re suitvant a une signification sp\['e]ciale, celle-ci sera ignor\['e]e, comme par exemple si on veut incorporer un espace dans le nom d'un fichier. @@ -65,8 +65,9 @@ comme par exemple si on veut incorporer un espace dans le nom d'un fichier. } .fi -Ici, les param\[`e]tres `flags', `startsector', `numsectors', `loop', -`ivoffset', `keyformat', `keymaxlen' et `passwdretries' sont optionnels. +Ici, les param\[`e]tres \(aqflags', \(aqstartsector', \(aqnumsectors', +\(aqloop', \(aqivoffset', \(aqkeyformat', \(aqkeymaxlen' +et \(aqpasswdretries' sont optionnels. Les param\[`e]tres ont les sens suivants: @@ -404,23 +405,23 @@ Il y en a aussi un cible qui represent une partition de pagination. # fin de cmtab .fi -La cible `basic' utilise le fichier ordinaire "/home/secretiveuser/crypt.fs" +La cible \(aqbasic' utilise le fichier ordinaire "/home/secretiveuser/crypt.fs" pour ranger le syst\[`e]me de fichiers chiffr\['e]. Un p\['e]riph\['e]rique loop sera configur\['e] automatiquement par .B cryptmount (\[`a] cause du "loop=auto"). -La cible `partition' utilise une partition enti\[`e]re du disque dur pour ranger le syst\[`e]me de fichiers chiffr\['e]. +La cible \(aqpartition' utilise une partition enti\[`e]re du disque dur pour ranger le syst\[`e]me de fichiers chiffr\['e]. La clef de d\['e]chiffrage est contenue dans le r\['e]pertoire principal de .B cryptmount. -La cible `subset' est semblable \[`a] la cible `partition' sauf qu'elle n'utilise pas une partition enti\[`e]re. +La cible \(aqsubset' est semblable \[`a] la cible \(aqpartition' sauf qu'elle n'utilise pas une partition enti\[`e]re. De cette mani\[`e]re, on peut utiliser des autres groupes de blocs de la partition pour des autres syst\[`e]mes de fichiers dirig\['e]s par .B cryptmount ou .B dmsetup. -La cible `encswap' utilise une partie d'une partition du disque dur pour proviser la pagination chiffr\['e]e. +La cible \(aqencswap' utilise une partie d'une partition du disque dur pour proviser la pagination chiffr\['e]e. Une nouvelle clef de d\['e]chiffrage sera lu du /dev/random chaque fois la cible est utilis\['e]e. .\" -------------------------------- @@ -447,6 +448,6 @@ dans le paquet source de cryptmount. .\" -------------------------------- .SH TRADUCTION -RW Penney, 2006-2014, avec beaucoup d'assistance de FP. +RW Penney, 2006-2020, avec beaucoup d'assistance de FP. .\" vim: set ts=4 sw=4 et: diff --git a/po/de.po b/po/de.po index 147d17f..aabb9f5 100644 --- a/po/de.po +++ b/po/de.po @@ -1,14 +1,15 @@ # German translation of the cryptmount language file resulting in de.po # Copyright © 2008-2014 Kai Wasserbäch +# 2020 Helge Kreutzmann # This file is distributed under the same license as the cryptmount package. # msgid "" msgstr "" -"Project-Id-Version: cryptmount 4.2-1\n" +"Project-Id-Version: cryptmount 5.3.2-1\n" "Report-Msgid-Bugs-To: rwpenney@users.sourceforge.net\n" "POT-Creation-Date: 2019-10-19 08:27+0100\n" -"PO-Revision-Date: 2011-06-12 12:07+0200\n" -"Last-Translator: Kai Wasserbäch \n" +"PO-Revision-Date: 2020-12-26 08:33+0100\n" +"Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -89,16 +90,14 @@ msgstr "" "%u, idx=%u).\n" #: armour-luks.c:217 -#, fuzzy, c-format +#, c-format msgid "Failed to acquire privileges for LUKS container" -msgstr "" -"Erstellen eines neuen Loop-Gerätes für LUKS-Schlüsseldatei schlug fehl.\n" +msgstr "Erlangen von Privilegien für LUKS-Container schlug fehl." #: armour-luks.c:310 armour-luks.c:394 -#, fuzzy, c-format +#, c-format msgid "Failed to initialize device for LUKS keyfile\n" -msgstr "" -"Erstellen eines neuen Loop-Gerätes für LUKS-Schlüsseldatei schlug fehl.\n" +msgstr "Initialisieren eines Gerätes für LUKS-Schlüsseldatei schlug fehl.\n" #: armour-luks.c:320 #, c-format @@ -127,7 +126,6 @@ msgid "Setting password on LUKS keyslot-%u\n" msgstr "Setze Passwort für den LUKS-Schlüsselplatz »%u«\n" #: cryptmount.c:127 -#, fuzzy msgid "" "usage: cryptmount [OPTION [target ...]]\n" "\n" @@ -153,7 +151,7 @@ msgid "" "\n" " please report bugs to \n" msgstr "" -"Aufruf: cryptmount [OPTION [Ziel ...]]\n" +"Aufruf: cryptmount [OPTION [Ziel …]]\n" "\n" " Die folgenden Optionen sind verfügbar:\n" "\n" @@ -162,6 +160,7 @@ msgstr "" " -c | --change-password \n" " -k | --key-managers\n" " -l | --list\n" +" -S | --status\n" " -m | --mount \n" " -u | --unmount \n" " --generate-key \n" @@ -249,9 +248,9 @@ msgid "Only user-%lu can unmount \"%s\"\n" msgstr "Nur der Benutzer mit der ID »%lu« kann »%s« aushängen.\n" #: cryptmount.c:663 -#, fuzzy, c-format +#, c-format msgid "Target \"%s\" is already configured\n" -msgstr "Ziel »%s« ist bereits eingehängt.\n" +msgstr "Ziel »%s« ist bereits konfiguriert.\n" #: cryptmount.c:686 cryptmount.c:742 #, c-format @@ -302,7 +301,7 @@ msgstr "Schlüsseldatei »%s« existiert für das Ziel »%s« bereits.\n" #: cryptmount.c:898 #, c-format msgid "Generating random key; please be patient...\n" -msgstr "Erstelle zufälligen Schlüssel; bitte warten Sie ...\n" +msgstr "Erstelle zufälligen Schlüssel; bitte warten Sie …\n" #: cryptmount.c:902 #, c-format @@ -332,12 +331,12 @@ msgstr "Kann keinen für das Ziel »%s« passenden Schlüsselmanager finden.\n" #: cryptmount.c:1415 #, c-format msgid "Multiple operating modes not supported\n" -msgstr "" +msgstr "Mehrere Betriebsmodi werden nicht unterstützt\n" #: cryptmount.c:1470 #, c-format msgid "Memory-locking failed...\n" -msgstr "Sperren des Arbeitsspeichers schlug fehl ...\n" +msgstr "Sperren des Arbeitsspeichers schlug fehl …\n" #: cryptmount.c:1498 #, c-format @@ -353,7 +352,7 @@ msgstr "Sicherheitsfehler\n" #, c-format msgid "Trailing command-line arguments given with '--all' option\n" msgstr "" -"Abschließende Kommandozeilen-Argumente; wurden zusammen mit der Option »--" +"Abschließende Befehlszeilen-Argumente; wurden zusammen mit der Option »--" "all« angegeben.\n" #: cryptmount.c:1559 @@ -418,9 +417,9 @@ msgid "Unable to allocate memory\n" msgstr "Konnte keinen Speicher reservieren.\n" #: utils.c:425 -#, fuzzy, c-format +#, c-format msgid "Too few random-number sources found\n" -msgstr "Kein Zufallszahlengenerator gefunden.\n" +msgstr "Zu wenige Zufallszahlenquellen gefunden.\n" #: utils.c:484 #, c-format @@ -470,7 +469,7 @@ msgstr "Kann nicht von der Standardeingabe lesen.\n" #: sysinit/setupscript.sh.in:41 #, sh-format msgid "Abandoning $ProgName ..." -msgstr "Beende $ProgName ..." +msgstr "Beende $ProgName …" #: sysinit/setupscript.sh.in:49 #, sh-format @@ -684,29 +683,29 @@ msgstr "erledigt" #: sysinit/setupscript.sh.in:229 #, sh-format msgid "Making mount-point (${mount_dir})..." -msgstr "Erstelle Einhängepunkt »${mount_dir}« ..." +msgstr "Erstelle Einhängepunkt »${mount_dir}« …" #: sysinit/setupscript.sh.in:232 #, sh-format msgid "Creating filesystem container (${crypto_dev})..." -msgstr "Erstelle Dateisystemcontainer »${crypto_dev}« ..." +msgstr "Erstelle Dateisystemcontainer »${crypto_dev}« …" #: sysinit/setupscript.sh.in:237 #, sh-format msgid "Taking backup of cryptmount master config-file (${bckp_cmtab})..." msgstr "" "Erstelle Sicherheitskopie der Haupt-Cryptmount-Konfigurationsdatei " -"»${bckp_cmtab}« ..." +"»${bckp_cmtab}« …" #: sysinit/setupscript.sh.in:254 #, sh-format msgid "Generating filesystem access key (${key_file})..." -msgstr "Erstelle Zugriffsschlüssel (${key_file}) für das Dateisystem ..." +msgstr "Erstelle Zugriffsschlüssel (${key_file}) für das Dateisystem …" #: sysinit/setupscript.sh.in:262 #, sh-format msgid "Formatting encrypted filesystem..." -msgstr "Formatiere das verschlüsselte Dateisystem ..." +msgstr "Formatiere das verschlüsselte Dateisystem …" #: sysinit/setupscript.sh.in:291 #, sh-format diff --git a/sysinit/setupscript.sh.in b/sysinit/setupscript.sh.in index ff73d4c..12e7fcf 100755 --- a/sysinit/setupscript.sh.in +++ b/sysinit/setupscript.sh.in @@ -292,7 +292,7 @@ eval_gettext "cryptmount setup script"; echo; echo eval_gettext "This program will allow you to setup a secure filing-system that will be managed by \"cryptmount\". You will be able to select basic features such as the location and size of the filesystem - if you want more advanced features, you should consult the cryptmount manual page." | FoldLines; echo; echo -echo "cryptmount version @PKG_VERSION@, (C)Copyright 2007-2014 RW Penney" +echo "cryptmount version @PKG_VERSION@, (C)Copyright 2007-2021 RW Penney" eval_gettext "cryptmount comes with ABSOLUTELY NO WARRANTY."; echo eval_gettext "This is free software, and you are welcome to redistribute it under certain conditions - see the file 'COPYING' in the source directory." | FoldLines; echo diff --git a/tables.c b/tables.c index 3b659cc..927c5f0 100644 --- a/tables.c +++ b/tables.c @@ -1,6 +1,6 @@ /* * Config-table and mount-table utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -1005,5 +1005,5 @@ int is_cmstatus_intact() } /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/tables.h b/tables.h index da02801..9a6e9e0 100644 --- a/tables.h +++ b/tables.h @@ -1,6 +1,6 @@ /* * Declarations for config-table & mount-table utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -71,5 +71,5 @@ int is_cmstatus_intact(); #endif /* _TABLES_H */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/testing/mudslinger.in b/testing/mudslinger.in index e54014d..3cce1bc 100755 --- a/testing/mudslinger.in +++ b/testing/mudslinger.in @@ -2,7 +2,7 @@ # Testing script for cryptmount (compiled with -DTESTING) # RW Penney, December 2005 -DD=/bin/dd +DD="/bin/dd oflag=sync" LOSETUP=/sbin/losetup SU_p="/bin/su -p" TMPDIR=/tmp/cm-$$ @@ -11,13 +11,23 @@ PASSWD="3normouslyComplexPassw0rd,maybe?" # Pair of users, with valid login-shells: USER1=bin USER2=nobody -# Pair of unused loopback devices: -LOOPDEV=`${LOSETUP} -f` -LOOPDEV2=/dev/loop5 +LOOPDEV=/dev/null +LOOPDEV2=/dev/null DATEFMT="+%d%b%y-%H:%M:%S" +function listLoopDevs() { + # Find free loopback devices least likely to be selected by 'losetup -f' + losetup -f > /dev/null + losetup -l -O NAME | \ + sed '1d' > ${TMPDIR}/usedLoops + ls /dev/loop[0-9] | \ + grep -v -f ${TMPDIR}/usedLoops | \ + sort -r > ${TMPDIR}/availableLoops +}; + + # # Testing infrastructure # @@ -281,9 +291,9 @@ function test_setup_roloop() { idx=`mkrandshort` mkdir ${TMPDIR}/romnt ${DD} if=/dev/zero of=${TMPDIR}/roloopfile bs=1M count=16 2>/dev/null - ${LOSETUP} ${LOOPDEV2} ${TMPDIR}/roloopfile - mke2fs -q ${LOOPDEV2} - mount -t ext2 ${LOOPDEV2} ${TMPDIR}/romnt + ${LOSETUP} "${LOOPDEV2}" ${TMPDIR}/roloopfile + mke2fs -q "${LOOPDEV2}" + mount -t ext2 "${LOOPDEV2}" ${TMPDIR}/romnt ${DD} if=/dev/zero of=${TMPDIR}/romnt/lpfl bs=1M count=8 2>/dev/null cat < ${TMPDIR}/cmtab target${idx} { @@ -295,7 +305,7 @@ function test_setup_roloop() { keyhash=sha1 keycipher=blowfish-cbc } EOF - cleanup="umount ${TMPDIR}/romnt; ${LOSETUP} -d ${LOOPDEV2}; rm ${TMPDIR}/roloopfile; rmdir ${TMPDIR}/romnt" + cleanup="umount ${TMPDIR}/romnt; ${LOSETUP} -d "${LOOPDEV2}"; rm ${TMPDIR}/roloopfile; rmdir ${TMPDIR}/romnt" rm -f ${TMPDIR}/keyfile if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then true; else test_fail "key-generation" "${cleanup}"; return; fi if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail "prepare" "${cleanup}" ; return; fi @@ -1029,7 +1039,7 @@ function test_offsets() { } EOF test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3 - ${DD} if=/dev/zero of=${LOOPDEV} 2>/dev/null + ${DD} if=/dev/zero of=${LOOPDEV} bs=1M count=32 2>/dev/null sync if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then cleanup="${CM} --config-dir ${TMPDIR} --release target${idx}" @@ -1310,23 +1320,24 @@ function test_luks_compat() { echo -n "keyslot0-password" > ${TMPDIR}/keymat0 echo -n "${PASSWD}" > ${TMPDIR}/keymat - for CipherLen in aes,128 blowfish,288 twofish-ecb,128 serpent-cbc-plain,96 + for CipherLen in aes,128 blowfish,288 twofish-xts-plain64,256 serpent-cbc-essiv:sha256,96 do tupelize $CipherLen cipher len echo "config: $CipherLen" 1>&3 # Setup partition with cryptsetup-luks: TMPTGT="mudslinger-`mkrandshort`" - if ${DD} if=/dev/zero of=${LOOPDEV} bs=1k count=1 conv=notrunc 2>/dev/null; then true; else test_fail "purging"; return; fi + if ${DD} if=/dev/zero of=${LOOPDEV} bs=1M count=1 conv=notrunc 2>/dev/null; then true; else test_fail "purging"; return; fi cryptsetup --batch-mode --cipher ${cipher} --key-size ${len} luksFormat "${LOOPDEV}" ${TMPDIR}/keymat0 1>&3 2>&3 + sync cryptsetup --key-file ${TMPDIR}/keymat0 --cipher ${cipher} --key-slot 2 luksAddKey "${LOOPDEV}" ${TMPDIR}/keymat 1>&3 2>&3 - wait_udev + sync; wait_udev cryptsetup --key-file ${TMPDIR}/keymat luksOpen "${LOOPDEV}" "${TMPTGT}" 1>&3 2>&3 if [ ! -b /dev/mapper/${TMPTGT} ]; then test_fail "luksOpen"; return; fi if mke2fs -q -j "/dev/mapper/${TMPTGT}"; then true; else test_fail mke2fs; return; fi wait_udev cryptsetup luksClose "${TMPTGT}" 2>&3 - sync + sync; wait_udev idx=`mkrandshort` cat < ${TMPDIR}/cmtab @@ -1338,7 +1349,7 @@ function test_luks_compat() { } EOF if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" target${idx}" 2>&3; then true; else test_fail "mount"; return; fi - wait_udev; sleep 1 + sync; wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail "unmount"; return; fi if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then test_fail "re-formatting"; fi wait_udev @@ -1366,11 +1377,11 @@ function test_luks_tapmoc() { target${idx} { dev=${LOOPDEV} dir=${TMPDIR}/mnt fstype=ext3 flags=nofsck - keyformat=luks keyfile=${LOOPDEV} + keyformat=luks cipher=${cipher}-${mode} } EOF - if ${DD} if=/dev/zero of=${LOOPDEV} bs=4k count=4 conv=notrunc 2>/dev/null; then true; else test_fail "purging"; return; fi + if ${DD} if=/dev/zero of=${LOOPDEV} bs=1M count=1 conv=notrunc 2>/dev/null; then true; else test_fail "purging"; return; fi sync if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 32 target${idx} 1>&3 2>&3; then true; else test_fail "key-generation"; return; fi if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail "prepare"; return; fi @@ -1503,8 +1514,10 @@ set -e touch ${TMPDIR}/keyfile ${DD} if=/dev/zero of=${TMPDIR}/loopfile bs=1M count=64 2>&3 1>&2 ${DD} if=/dev/zero of=${TMPDIR}/devfile bs=1M count=64 2>&3 1>&2 +listLoopDevs +LOOPDEV=`sed -n '1p' "${TMPDIR}/availableLoops"` +LOOPDEV2=`sed -n '2p' "${TMPDIR}/availableLoops"` if ${LOSETUP} ${LOOPDEV} ${TMPDIR}/devfile; then true; else echo "Failed to setup ${LOOPDEV}"; exit 2; fi -LOOPDEV2=`${LOSETUP} -f` set +e # Keep record of existing device-mapper targets @@ -1561,7 +1574,8 @@ wait_udev ${LOSETUP} -d ${LOOPDEV} rm -f ${TMPDIR}/loopfile ${TMPDIR}/devfile ${TMPDIR}/keyfile \ ${TMPDIR}/cmtab ${TMPDIR}/cryptmount.status \ - ${TMPDIR}/dm-list0 ${TMPDIR}/bingrep + ${TMPDIR}/dm-list0 ${TMPDIR}/bingrep \ + ${TMPDIR}/usedLoops ${TMPDIR}/availableLoops rmdir ${TMPDIR}/mnt* ${TMPDIR} exit 0 diff --git a/utils.c b/utils.c index 5aca99e..13fe24d 100644 --- a/utils.c +++ b/utils.c @@ -1,6 +1,6 @@ /* * Miscellaneous utility functions for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -1035,5 +1035,5 @@ int ut_pwfort() #endif /* TESTING */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ diff --git a/utils.h b/utils.h index 1135796..cea4cc7 100644 --- a/utils.h +++ b/utils.h @@ -1,6 +1,6 @@ /* * Declarations for miscellaneous utilities for cryptmount - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */ /* @@ -135,5 +135,5 @@ static inline int cm_fwrite(const void *buff, size_t nbytes, FILE *stream) { #endif /* _UTILS_H */ /* - * (C)Copyright 2005-2019, RW Penney + * (C)Copyright 2005-2021, RW Penney */