diff -Nru cryptmount-5.3.1/aclocal.m4 cryptmount-5.3.2/aclocal.m4 --- cryptmount-5.3.1/aclocal.m4 2019-01-05 14:11:37.000000000 +0000 +++ cryptmount-5.3.2/aclocal.m4 2019-10-13 07:30:28.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2748,7 +2748,7 @@ AC_SUBST([$1])dnl ]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2760,10 +2760,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -2779,14 +2779,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2838,7 +2838,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2871,7 +2871,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2958,8 +2958,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -3026,7 +3026,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3068,7 +3068,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3089,7 +3089,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3110,7 +3110,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3149,7 +3149,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3178,7 +3178,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3225,7 +3225,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3244,7 +3244,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3325,7 +3325,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3385,7 +3385,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3413,7 +3413,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3432,7 +3432,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru cryptmount-5.3.1/armour-luks.c cryptmount-5.3.2/armour-luks.c --- cryptmount-5.3.1/armour-luks.c 2019-01-05 14:04:12.000000000 +0000 +++ cryptmount-5.3.2/armour-luks.c 2019-10-13 07:44:57.000000000 +0000 @@ -213,7 +213,9 @@ if (stat(filename, &sbuff) == 0 && S_ISREG(sbuff.st_mode)) { - (void)setuid(geteuid()); + if (setuid(geteuid()) != 0) { + fprintf(stderr, _("Failed to acquire privileges for LUKS container")); + } } return olduid; diff -Nru cryptmount-5.3.1/ChangeLog cryptmount-5.3.2/ChangeLog --- cryptmount-5.3.1/ChangeLog 2019-01-05 14:40:27.000000000 +0000 +++ cryptmount-5.3.2/ChangeLog 2019-11-16 12:38:58.000000000 +0000 @@ -1,5 +1,13 @@ ChangeLog for cryptmount (http://cryptmount.sourceforge.net) +16Nov19 - Refined handling of passwords in "mudslinger" testing script + +06Oct19 - Improved documentation of default values in cmtab manual page + +28Sep19 - Removed use of 'minix' filesystem in testing script + +06Jan19 - Fixed various memory leaks in mount/unmount pathways + 05Jan19 - Fixed memory cleanup error on closedown when using multiple targets 17Mar18 - *** cryptmount-5.3 released diff -Nru cryptmount-5.3.1/configure cryptmount-5.3.2/configure --- cryptmount-5.3.1/configure 2019-01-05 14:11:38.000000000 +0000 +++ cryptmount-5.3.2/configure 2019-10-13 07:30:29.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for cryptmount 5.3.1. +# Generated by GNU Autoconf 2.69 for cryptmount 5.3.2. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='cryptmount' PACKAGE_TARNAME='cryptmount' -PACKAGE_VERSION='5.3.1' -PACKAGE_STRING='cryptmount 5.3.1' +PACKAGE_VERSION='5.3.2' +PACKAGE_STRING='cryptmount 5.3.2' PACKAGE_BUGREPORT='cryptmount@rwpenney.uk' PACKAGE_URL='' @@ -1342,7 +1342,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cryptmount 5.3.1 to adapt to many kinds of systems. +\`configure' configures cryptmount 5.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1413,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cryptmount 5.3.1:";; + short | recursive ) echo "Configuration of cryptmount 5.3.2:";; esac cat <<\_ACEOF @@ -1537,7 +1537,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cryptmount configure 5.3.1 +cryptmount configure 5.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1952,7 +1952,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cryptmount $as_me 5.3.1, which was +It was created by cryptmount $as_me 5.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2312,7 +2312,7 @@ LIBS_GCRY="" LIBS_LUKS="" -am__api_version='1.15' +am__api_version='1.16' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2827,7 +2827,7 @@ # Define the identity of the package. PACKAGE='cryptmount' - VERSION='5.3.1' + VERSION='5.3.2' cat >>confdefs.h <<_ACEOF @@ -2857,8 +2857,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -2909,7 +2909,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -9431,7 +9431,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cryptmount $as_me 5.3.1, which was +This file was extended by cryptmount $as_me 5.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9497,7 +9497,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cryptmount config.status 5.3.1 +cryptmount config.status 5.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru cryptmount-5.3.1/configure.ac cryptmount-5.3.2/configure.ac --- cryptmount-5.3.1/configure.ac 2019-01-05 14:03:06.000000000 +0000 +++ cryptmount-5.3.2/configure.ac 2019-10-13 07:30:23.000000000 +0000 @@ -1,9 +1,9 @@ dnl autoconf script for cryptmount -dnl (C)Copyright 2005-2018, RW Penney +dnl (C)Copyright 2005-2019, RW Penney dnl run 'aclocal; autoconf; automake -a -c -i; ./configure; make' -AC_INIT(cryptmount, 5.3.1, cryptmount@rwpenney.uk) +AC_INIT(cryptmount, 5.3.2, cryptmount@rwpenney.uk) AC_PREREQ(2.59) test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc diff -Nru cryptmount-5.3.1/cryptmount.c cryptmount-5.3.2/cryptmount.c --- cryptmount-5.3.1/cryptmount.c 2019-01-05 14:13:07.000000000 +0000 +++ cryptmount-5.3.2/cryptmount.c 2019-01-06 09:01:21.000000000 +0000 @@ -458,6 +458,7 @@ bail_out: if (killloop) unblockify_file(&tgtdev, isloop); /* mounting failed? */ + if (tgtdev) free((void*)tgtdev); sec_free(dmparams); sec_free(key); @@ -593,8 +594,8 @@ { const tgtdefn_t *tgt = boundtgt->tgt; int eflag=ERR_NOERROR; struct passwd *pwent; - char *mntdev=NULL; - tgtstat_t *tstat; + char *mntdev = NULL; + tgtstat_t *tstat = NULL; /* Check if filing system has been configured at all: */ if (!is_mounted(tgt) || (tstat = get_tgtstatus(tgt)) == NULL) { @@ -637,6 +638,7 @@ bail_out: if (mntdev != NULL) free((void*)mntdev); + if (tstat != NULL) free_tgtstatus(tstat); return eflag; } diff -Nru cryptmount-5.3.1/cryptmount.spec cryptmount-5.3.2/cryptmount.spec --- cryptmount-5.3.1/cryptmount.spec 2019-01-05 16:05:26.000000000 +0000 +++ cryptmount-5.3.2/cryptmount.spec 2019-11-17 09:41:41.000000000 +0000 @@ -4,7 +4,7 @@ # Summary: Let ordinary users mount an encrypted file system Name: cryptmount -Version: 5.3.1 +Version: 5.3.2 Release: 1%{?dist} License: GPL URL: http://cryptmount.sourceforge.net diff -Nru cryptmount-5.3.1/debian/changelog cryptmount-5.3.2/debian/changelog --- cryptmount-5.3.1/debian/changelog 2019-01-05 16:19:47.000000000 +0000 +++ cryptmount-5.3.2/debian/changelog 2019-11-17 09:44:27.000000000 +0000 @@ -1,3 +1,11 @@ +cryptmount (5.3.2-1) unstable; urgency=low + + * New upstream release + - various documentation cleanups + - fixed (benign) memory leak + + -- RW Penney Sun, 17 Nov 2019 16:20:00 +0000 + cryptmount (5.3.1-1) unstable; urgency=low * New upstream release: diff -Nru cryptmount-5.3.1/debian/control cryptmount-5.3.2/debian/control --- cryptmount-5.3.1/debian/control 2019-01-05 16:09:27.000000000 +0000 +++ cryptmount-5.3.2/debian/control 2019-10-13 08:16:42.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: automake, debhelper (>= 10), libcryptsetup-dev (>= 1.6), libdevmapper-dev, libgcrypt20-dev (>= 1.5), pkg-config Rules-Requires-Root: binary-targets -Standards-Version: 4.3.0 +Standards-Version: 4.4.1 Package: cryptmount Architecture: linux-any diff -Nru cryptmount-5.3.1/debian/docs cryptmount-5.3.2/debian/docs --- cryptmount-5.3.1/debian/docs 2015-10-29 19:00:29.000000000 +0000 +++ cryptmount-5.3.2/debian/docs 2019-11-09 11:40:40.000000000 +0000 @@ -1,6 +1,5 @@ NEWS README -README.OpenSSL README.sshfs RELNOTES ToDo diff -Nru cryptmount-5.3.1/debian/rules cryptmount-5.3.2/debian/rules --- cryptmount-5.3.1/debian/rules 2018-02-17 18:28:25.000000000 +0000 +++ cryptmount-5.3.2/debian/rules 2019-01-06 14:51:51.000000000 +0000 @@ -9,7 +9,7 @@ include /usr/share/dpkg/default.mk # see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS diff -Nru cryptmount-5.3.1/fsutils.c cryptmount-5.3.2/fsutils.c --- cryptmount-5.3.1/fsutils.c 2019-01-05 14:04:12.000000000 +0000 +++ cryptmount-5.3.2/fsutils.c 2019-01-06 08:56:24.000000000 +0000 @@ -447,8 +447,8 @@ * to swap partitions, even if they are active. */ int is_mounted(const tgtdefn_t *tgt) -{ int mounted=0; - char *mntdev=NULL; +{ int mounted = 0; + char *mntdev = NULL; struct mntent *mntinfo; struct stat st_mtb, st_tgt; FILE *fp; @@ -458,12 +458,17 @@ /* find path to device that would have been mounted & device info: */ devmap_path(&mntdev, tgt->ident); - if (stat(mntdev, &st_tgt) != 0) return 0; + if (stat(mntdev, &st_tgt) != 0) { + mounted = 0; + goto bail_out; + } /* check entries in /etc/mtab: */ fp = setmntent(ETCMTAB, "r"); if (fp == NULL) { - return 0; /* indeterminate case - assume not mounted */ + /* indeterminate case - assume not mounted */ + mounted = 0; + goto bail_out; } while ((mntinfo = getmntent(fp)) != NULL && !mounted) { if (stat(mntinfo->mnt_fsname, &st_mtb) != 0) continue; @@ -476,6 +481,9 @@ } endmntent(fp); + bail_out: + if (mntdev) free((void*)mntdev); + return mounted; } diff -Nru cryptmount-5.3.1/looputils.c cryptmount-5.3.2/looputils.c --- cryptmount-5.3.1/looputils.c 2019-01-05 14:04:12.000000000 +0000 +++ cryptmount-5.3.2/looputils.c 2019-01-06 08:43:19.000000000 +0000 @@ -47,6 +47,7 @@ #include "cryptmount.h" #include "looputils.h" +char *cm_strdup(const char *orig); /** @@ -248,7 +249,7 @@ if (S_ISBLK(sbuff.st_mode)) { /* Keyfile is block-special already: */ - *devname = filename; + *devname = cm_strdup(filename); *isloop = 0; } else if (S_ISREG(sbuff.st_mode)) { /* Create loopback device around ordinary file: */ diff -Nru cryptmount-5.3.1/Makefile.am cryptmount-5.3.2/Makefile.am --- cryptmount-5.3.1/Makefile.am 2015-11-15 12:14:02.000000000 +0000 +++ cryptmount-5.3.2/Makefile.am 2019-11-09 12:35:08.000000000 +0000 @@ -24,7 +24,7 @@ localedir=$(datadir)/locale AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" EXTRA_DIST = config.rpath mkinstalldirs cmtab.example \ - README.OpenSSL README.sshfs RELNOTES ToDo cryptmount.spec \ + README.sshfs RELNOTES ToDo cryptmount.spec \ debian/changelog debian/compat debian/control \ debian/copyright debian/docs \ debian/rules debian/cryptmount.lintian-overrides \ diff -Nru cryptmount-5.3.1/Makefile.in cryptmount-5.3.2/Makefile.in --- cryptmount-5.3.1/Makefile.in 2019-01-05 14:11:38.000000000 +0000 +++ cryptmount-5.3.2/Makefile.in 2019-11-09 12:35:11.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -130,7 +130,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) @@ -165,7 +165,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, @@ -384,7 +384,7 @@ cryptmount_NONHEADERS = $(shell echo "${cryptmount_SOURCES}" | sed 's%\<[^ ]*\.h\>%%g') @BUILD_LUKSCOMPAT_TRUE@cryptmount_LDADD = ${libcryptsetup_LIBS} EXTRA_DIST = config.rpath mkinstalldirs cmtab.example \ - README.OpenSSL README.sshfs RELNOTES ToDo cryptmount.spec \ + README.sshfs RELNOTES ToDo cryptmount.spec \ debian/changelog debian/compat debian/control \ debian/copyright debian/docs \ debian/rules debian/cryptmount.lintian-overrides \ @@ -418,8 +418,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -614,7 +614,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -682,7 +685,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -708,7 +711,7 @@ @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -726,7 +729,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -736,7 +739,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -Nru cryptmount-5.3.1/man/cmtab.5.in cryptmount-5.3.2/man/cmtab.5.in --- cryptmount-5.3.1/man/cmtab.5.in 2019-01-05 14:33:32.000000000 +0000 +++ cryptmount-5.3.2/man/cmtab.5.in 2019-11-17 09:30:43.000000000 +0000 @@ -12,7 +12,7 @@ .. -.TH CMTAB 5 "2019-01-05" "@PACKAGE_VERSION@" "User commands" +.TH CMTAB 5 "2019-10-06" "@PACKAGE_VERSION@" "User commands" .SH NAME cmtab \- static information about filesystems managed by cryptmount @@ -25,11 +25,16 @@ is contained in the file @CM_SYSCONF_DIR@/cmtab. Each filesystem is labelled by a target name which can be used as an argument to .B cryptmount -and which appears in @CM_SYSCONF_DIR@/cmtab in front of a list of parameters describing where that filesystem is stored, and how it is encrypted. +and which appears in @CM_SYSCONF_DIR@/cmtab in front of a list of parameters +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, lasting to the end of the line. -The backslash character `\\' can be used to ignore any special significance of the following character, for example to include a space in a filename. +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, +lasting to the end of the line. +The backslash character `\\' 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: @@ -40,7 +45,7 @@ startsector=STARTSECTOR numsectors=NUMSECTORS loop=LOOPDEV - dir=MOUNT_POINT + dir=MOUNT_POINT # REQUIRED fstype=TYPE # REQUIRED mountoptions=MOPT,MOPT,... fsckoptions=FOPT;FOPT;... @@ -94,7 +99,7 @@ i.e. this pseudo-target does not operate incrementally. .\" ---- .TP -.B dev=DEVICE +.B dev=DEVICE\t(required) sets the name of the raw device (e.g. /dev/hdb63) or ordinary file (e.g. /home/secretiveuser/private.fs) that contains the encrypted filesystem. @@ -137,11 +142,11 @@ to be used when DEVICE is an ordinary file. This parameter is optional and defaults to "auto". .TP -.B dir=MOUNT_POINT +.B dir=MOUNT_POINT\t(required) specifies the directory onto which the encrypted filesystem will be mounted. .\" ---- .TP -.B fstype=TYPE +.B fstype=TYPE\t(required) sets the filesystem type (as used by .B mount (8)). @@ -175,7 +180,8 @@ .B bootaction=BOOTACTION indicates what action, if any, should be taken for this target on system bootup. -BOOTACTION can be one of "none", "mount", "swap" or "prepare". +BOOTACTION can be one of "none", "mount", "swap" or "prepare", +with the default being "none". .TP .B cipher=CIPHER sets the encryption algorithm used on the @@ -199,7 +205,7 @@ with an automatic choice being made when reading a pre-existing key. .\" ---- .TP -.B keyfile=KEYFILE +.B keyfile=KEYFILE\t(required) gives the name of an ordinary file that contains the key used by the .B CIPHER algorithm to decrypt the filesystem. This key is itself encrypted in a way specified by the diff -Nru cryptmount-5.3.1/man/fr/Makefile.in cryptmount-5.3.2/man/fr/Makefile.in --- cryptmount-5.3.1/man/fr/Makefile.in 2019-01-05 14:11:38.000000000 +0000 +++ cryptmount-5.3.2/man/fr/Makefile.in 2019-10-13 07:30:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -307,8 +307,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -412,7 +412,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru cryptmount-5.3.1/man/Makefile.in cryptmount-5.3.2/man/Makefile.in --- cryptmount-5.3.1/man/Makefile.in 2019-01-05 14:11:38.000000000 +0000 +++ cryptmount-5.3.2/man/Makefile.in 2019-10-13 07:30:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -165,7 +165,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -368,8 +368,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -566,7 +566,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru cryptmount-5.3.1/po/cryptmount.pot cryptmount-5.3.2/po/cryptmount.pot --- cryptmount-5.3.1/po/cryptmount.pot 2019-01-05 14:15:32.000000000 +0000 +++ cryptmount-5.3.2/po/cryptmount.pot 2019-10-19 07:27:26.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: rwpenney@users.sourceforge.net\n" -"POT-Creation-Date: 2019-01-05 14:15+0000\n" +"POT-Creation-Date: 2019-10-19 08:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,32 +87,37 @@ msgid "Checksum mismatch in keyfile (openssl-compat, ofs=%u,idx=%u)\n" msgstr "" -#: armour-luks.c:308 armour-luks.c:392 +#: armour-luks.c:217 +#, c-format +msgid "Failed to acquire privileges for LUKS container" +msgstr "" + +#: armour-luks.c:310 armour-luks.c:394 #, c-format msgid "Failed to initialize device for LUKS keyfile\n" msgstr "" -#: armour-luks.c:318 +#: armour-luks.c:320 #, c-format msgid "Failed to extract LUKS key for \"%s\" (errno=%d)\n" msgstr "" -#: armour-luks.c:379 +#: armour-luks.c:381 #, c-format msgid "Formatting \"%s\", will probably destroy all existing data" msgstr "" -#: armour-luks.c:408 +#: armour-luks.c:410 #, c-format msgid "Failed to create LUKS header for \"%s\"\n" msgstr "" -#: armour-luks.c:418 +#: armour-luks.c:420 #, c-format msgid "Failed to create LUKS key for \"%s\"\n" msgstr "" -#: armour-luks.c:431 +#: armour-luks.c:433 #, c-format msgid "Setting password on LUKS keyslot-%u\n" msgstr "" @@ -178,32 +183,32 @@ msgid "Device-mapper target-creation failed for \"%s\"\n" msgstr "" -#: cryptmount.c:487 cryptmount.c:720 +#: cryptmount.c:488 cryptmount.c:722 #, c-format msgid "Target \"%s\" does not appear to be configured\n" msgstr "" -#: cryptmount.c:502 +#: cryptmount.c:503 #, c-format msgid "Cannot stat \"%s\"\n" msgstr "" -#: cryptmount.c:510 +#: cryptmount.c:511 #, c-format msgid "Failed to remove device-mapper target \"%s\"\n" msgstr "" -#: cryptmount.c:543 +#: cryptmount.c:544 #, c-format msgid "Target \"%s\" is already mounted\n" msgstr "" -#: cryptmount.c:601 +#: cryptmount.c:602 #, c-format msgid "Target \"%s\" does not appear to be mounted\n" msgstr "" -#: cryptmount.c:611 +#: cryptmount.c:612 #, c-format msgid "Only \"%s\" can unmount \"%s\"\n" msgstr "" @@ -211,122 +216,122 @@ #. TRANSLATORS: the following expands to include #. the *numerical* user-identity in place of '%lu', #. e.g. giving 'only user-16 can unmount "target"': -#: cryptmount.c:617 +#: cryptmount.c:618 #, c-format msgid "Only user-%lu can unmount \"%s\"\n" msgstr "" -#: cryptmount.c:661 +#: cryptmount.c:663 #, c-format msgid "Target \"%s\" is already configured\n" msgstr "" -#: cryptmount.c:684 cryptmount.c:740 +#: cryptmount.c:686 cryptmount.c:742 #, c-format msgid "Crypto-swap is not supported by this installation of cryptmount\n" msgstr "" -#: cryptmount.c:772 +#: cryptmount.c:774 #, c-format msgid "Key-file for \"%s\" isn't password-protected\n" msgstr "" -#: cryptmount.c:798 cryptmount.c:919 +#: cryptmount.c:800 cryptmount.c:921 #, c-format msgid "Cannot open \"%s\" for writing\n" msgstr "" -#: cryptmount.c:813 +#: cryptmount.c:815 #, c-format msgid "Retiring old key (%s -> %s) failed\n" msgstr "" -#: cryptmount.c:821 +#: cryptmount.c:823 #, c-format msgid "Installing new key (%s -> %s) failed\n" msgstr "" -#: cryptmount.c:828 +#: cryptmount.c:830 #, c-format msgid "Backup of previous key is in \"%s\"\n" msgstr "" -#: cryptmount.c:868 cryptmount.c:1545 +#: cryptmount.c:870 cryptmount.c:1547 #, c-format msgid "Target name \"%s\" is not recognized\n" msgstr "" -#: cryptmount.c:874 +#: cryptmount.c:876 #, c-format msgid "Bad key-length parameter" msgstr "" -#: cryptmount.c:886 +#: cryptmount.c:888 #, c-format msgid "Key-file \"%s\" already exists for target \"%s\"\n" msgstr "" -#: cryptmount.c:896 +#: cryptmount.c:898 #, c-format msgid "Generating random key; please be patient...\n" msgstr "" -#: cryptmount.c:900 +#: cryptmount.c:902 #, c-format msgid "Failed to generate new key\n" msgstr "" -#: cryptmount.c:933 +#: cryptmount.c:935 #, c-format msgid "Installation of new keyfile \"%s\" failed" msgstr "" -#: cryptmount.c:1069 +#: cryptmount.c:1071 #, c-format msgid "Only root can use option \"%s\"\n" msgstr "" -#: cryptmount.c:1082 +#: cryptmount.c:1084 #, c-format msgid "Only root can configure \"%s\"\n" msgstr "" -#: cryptmount.c:1146 +#: cryptmount.c:1148 #, c-format msgid "Cannot find key-manager to match target \"%s\"\n" msgstr "" -#: cryptmount.c:1413 +#: cryptmount.c:1415 #, c-format msgid "Multiple operating modes not supported\n" msgstr "" -#: cryptmount.c:1468 +#: cryptmount.c:1470 #, c-format msgid "Memory-locking failed...\n" msgstr "" -#: cryptmount.c:1496 +#: cryptmount.c:1498 #, c-format msgid "Bad file-descriptor (%d)\n" msgstr "" -#: cryptmount.c:1506 +#: cryptmount.c:1508 #, c-format msgid "Security failure\n" msgstr "" -#: cryptmount.c:1525 +#: cryptmount.c:1527 #, c-format msgid "Trailing command-line arguments given with '--all' option\n" msgstr "" -#: cryptmount.c:1557 +#: cryptmount.c:1559 #, c-format msgid "Target security failure for \"%s\"\n" msgstr "" -#: cryptmount.c:1566 +#: cryptmount.c:1568 #, c-format msgid "No targets specified\n" msgstr "" @@ -343,17 +348,17 @@ "mkswap manually\n" msgstr "" -#: looputils.c:225 +#: looputils.c:226 #, c-format msgid "Failed to free device (%d,%d)\n" msgstr "" -#: looputils.c:261 +#: looputils.c:262 #, c-format msgid "No available loopback devices\n" msgstr "" -#: looputils.c:275 +#: looputils.c:276 #, c-format msgid "Bad device type (%x) for \"%s\" (need block/file)\n" msgstr "" Binary files /tmp/tmpgG_yti/_LIa6Zit4J/cryptmount-5.3.1/po/de.gmo and /tmp/tmpgG_yti/RZJciKkzK_/cryptmount-5.3.2/po/de.gmo differ diff -Nru cryptmount-5.3.1/po/de.po cryptmount-5.3.2/po/de.po --- cryptmount-5.3.1/po/de.po 2019-01-05 14:15:32.000000000 +0000 +++ cryptmount-5.3.2/po/de.po 2019-10-19 07:27:26.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: cryptmount 4.2-1\n" "Report-Msgid-Bugs-To: rwpenney@users.sourceforge.net\n" -"POT-Creation-Date: 2019-01-05 14:15+0000\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" "Language-Team: German \n" @@ -88,34 +88,40 @@ "Nicht übereinstimmende Prüfsumme in der Schlüsseldatei (openssl-compat, ofs=" "%u, idx=%u).\n" -#: armour-luks.c:308 armour-luks.c:392 +#: armour-luks.c:217 +#, fuzzy, 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" + +#: armour-luks.c:310 armour-luks.c:394 #, fuzzy, 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" -#: armour-luks.c:318 +#: armour-luks.c:320 #, c-format msgid "Failed to extract LUKS key for \"%s\" (errno=%d)\n" msgstr "Auslesen des LUKS-Schlüssels für »%s« schlug fehl (errno=%d).\n" -#: armour-luks.c:379 +#: armour-luks.c:381 #, c-format msgid "Formatting \"%s\", will probably destroy all existing data" msgstr "" "Formatiere »%s«, dies wird wahrscheinlich alle bestehenden Daten zerstören." -#: armour-luks.c:408 +#: armour-luks.c:410 #, c-format msgid "Failed to create LUKS header for \"%s\"\n" msgstr "Erstellen eines neuen LUKS-Headers für »%s« schlug fehl.\n" -#: armour-luks.c:418 +#: armour-luks.c:420 #, c-format msgid "Failed to create LUKS key for \"%s\"\n" msgstr "Erstellen eines neuen LUKS-Schlüssels für »%s« schlug fehl.\n" -#: armour-luks.c:431 +#: armour-luks.c:433 #, c-format msgid "Setting password on LUKS keyslot-%u\n" msgstr "Setze Passwort für den LUKS-Schlüsselplatz »%u«\n" @@ -204,32 +210,32 @@ msgid "Device-mapper target-creation failed for \"%s\"\n" msgstr "Erstellen des device-mapper-Ziels für »%s« schlug fehl.\n" -#: cryptmount.c:487 cryptmount.c:720 +#: cryptmount.c:488 cryptmount.c:722 #, c-format msgid "Target \"%s\" does not appear to be configured\n" msgstr "Ziel »%s« scheint unkonfiguriert zu sein.\n" -#: cryptmount.c:502 +#: cryptmount.c:503 #, c-format msgid "Cannot stat \"%s\"\n" msgstr "Kann Status für »%s« nicht abfragen.\n" -#: cryptmount.c:510 +#: cryptmount.c:511 #, c-format msgid "Failed to remove device-mapper target \"%s\"\n" msgstr "Entfernen des device-mapper-Ziels »%s« schlug fehl.\n" -#: cryptmount.c:543 +#: cryptmount.c:544 #, c-format msgid "Target \"%s\" is already mounted\n" msgstr "Ziel »%s« ist bereits eingehängt.\n" -#: cryptmount.c:601 +#: cryptmount.c:602 #, c-format msgid "Target \"%s\" does not appear to be mounted\n" msgstr "Ziel »%s« scheint noch nicht eingehängt zu sein.\n" -#: cryptmount.c:611 +#: cryptmount.c:612 #, c-format msgid "Only \"%s\" can unmount \"%s\"\n" msgstr "Nur »%s« kann »%s« aushängen.\n" @@ -237,125 +243,125 @@ #. TRANSLATORS: the following expands to include #. the *numerical* user-identity in place of '%lu', #. e.g. giving 'only user-16 can unmount "target"': -#: cryptmount.c:617 +#: cryptmount.c:618 #, c-format msgid "Only user-%lu can unmount \"%s\"\n" msgstr "Nur der Benutzer mit der ID »%lu« kann »%s« aushängen.\n" -#: cryptmount.c:661 +#: cryptmount.c:663 #, fuzzy, c-format msgid "Target \"%s\" is already configured\n" msgstr "Ziel »%s« ist bereits eingehängt.\n" -#: cryptmount.c:684 cryptmount.c:740 +#: cryptmount.c:686 cryptmount.c:742 #, c-format msgid "Crypto-swap is not supported by this installation of cryptmount\n" msgstr "" "Crypto-swap wird von dieser cryptmount-Installation nicht unterstützt.\n" -#: cryptmount.c:772 +#: cryptmount.c:774 #, c-format msgid "Key-file for \"%s\" isn't password-protected\n" msgstr "Schlüsseldatei für »%s« ist nicht passwortgeschützt.\n" -#: cryptmount.c:798 cryptmount.c:919 +#: cryptmount.c:800 cryptmount.c:921 #, c-format msgid "Cannot open \"%s\" for writing\n" msgstr "Kann »%s« nicht zum Schreiben öffnen.\n" -#: cryptmount.c:813 +#: cryptmount.c:815 #, c-format msgid "Retiring old key (%s -> %s) failed\n" msgstr "Ausmustern des alten Schlüssels (%s -> %s) schlug fehl.\n" -#: cryptmount.c:821 +#: cryptmount.c:823 #, c-format msgid "Installing new key (%s -> %s) failed\n" msgstr "Installation des neuen Schlüssels (%s -> %s) schlug fehl.\n" -#: cryptmount.c:828 +#: cryptmount.c:830 #, c-format msgid "Backup of previous key is in \"%s\"\n" msgstr "Eine Sicherheitskopie des vorherigen Schlüssels ist in »%s«.\n" -#: cryptmount.c:868 cryptmount.c:1545 +#: cryptmount.c:870 cryptmount.c:1547 #, c-format msgid "Target name \"%s\" is not recognized\n" msgstr "Zielname »%s« wurde nicht erkannt.\n" -#: cryptmount.c:874 +#: cryptmount.c:876 #, c-format msgid "Bad key-length parameter" msgstr "Falscher Schlüssellängen-Parameter" -#: cryptmount.c:886 +#: cryptmount.c:888 #, c-format msgid "Key-file \"%s\" already exists for target \"%s\"\n" msgstr "Schlüsseldatei »%s« existiert für das Ziel »%s« bereits.\n" -#: cryptmount.c:896 +#: cryptmount.c:898 #, c-format msgid "Generating random key; please be patient...\n" msgstr "Erstelle zufälligen Schlüssel; bitte warten Sie ...\n" -#: cryptmount.c:900 +#: cryptmount.c:902 #, c-format msgid "Failed to generate new key\n" msgstr "Generieren des neuen Schlüssels schlug fehl\n" -#: cryptmount.c:933 +#: cryptmount.c:935 #, c-format msgid "Installation of new keyfile \"%s\" failed" msgstr "Installation der neuen Schlüsseldatei »%s« schlug fehl." -#: cryptmount.c:1069 +#: cryptmount.c:1071 #, c-format msgid "Only root can use option \"%s\"\n" msgstr "Nur root kann die Option »%s« verwenden.\n" -#: cryptmount.c:1082 +#: cryptmount.c:1084 #, c-format msgid "Only root can configure \"%s\"\n" msgstr "Nur root kann »%s« konfigurieren.\n" -#: cryptmount.c:1146 +#: cryptmount.c:1148 #, c-format msgid "Cannot find key-manager to match target \"%s\"\n" msgstr "Kann keinen für das Ziel »%s« passenden Schlüsselmanager finden.\n" -#: cryptmount.c:1413 +#: cryptmount.c:1415 #, c-format msgid "Multiple operating modes not supported\n" msgstr "" -#: cryptmount.c:1468 +#: cryptmount.c:1470 #, c-format msgid "Memory-locking failed...\n" msgstr "Sperren des Arbeitsspeichers schlug fehl ...\n" -#: cryptmount.c:1496 +#: cryptmount.c:1498 #, c-format msgid "Bad file-descriptor (%d)\n" msgstr "Fehlerhafter Dateideskriptor (%d)\n" -#: cryptmount.c:1506 +#: cryptmount.c:1508 #, c-format msgid "Security failure\n" msgstr "Sicherheitsfehler\n" -#: cryptmount.c:1525 +#: cryptmount.c:1527 #, c-format msgid "Trailing command-line arguments given with '--all' option\n" msgstr "" "Abschließende Kommandozeilen-Argumente; wurden zusammen mit der Option »--" "all« angegeben.\n" -#: cryptmount.c:1557 +#: cryptmount.c:1559 #, c-format msgid "Target security failure for \"%s\"\n" msgstr "Sicherheitsfehler für Ziel »%s«.\n" -#: cryptmount.c:1566 +#: cryptmount.c:1568 #, c-format msgid "No targets specified\n" msgstr "Keine Ziele angegeben.\n" @@ -374,17 +380,17 @@ "Das Gerät »%s« scheint Daten zu enthalten (Entropie=%.3g,%.3g) – bitte " "führen Sie mkswap manuell aus.\n" -#: looputils.c:225 +#: looputils.c:226 #, c-format msgid "Failed to free device (%d,%d)\n" msgstr "Konnte Gerät (%d,%d) nicht freigeben.\n" -#: looputils.c:261 +#: looputils.c:262 #, c-format msgid "No available loopback devices\n" msgstr "Keine verfügbaren Loopback-Geräte.\n" -#: looputils.c:275 +#: looputils.c:276 #, c-format msgid "Bad device type (%x) for \"%s\" (need block/file)\n" msgstr "Falscher Gerätetyp (%x) für »%s« (Block/Datei benötigt).\n" @@ -748,10 +754,6 @@ msgid "After you have finished using the filesystem, try:" msgstr "Nach der Benutzung des Dateisystems, geben Sie bitte Folgendes ein:" -#~ msgid "Failed to create loop device for LUKS keyfile\n" -#~ msgstr "" -#~ "Erstellen eines neuen Loop-Gerätes für LUKS-Schlüsseldatei schlug fehl.\n" - #~ msgid "Failed to read LUKS header for \"%s\"\n" #~ msgstr "Konnte LUKS-Header von »%s« nicht lesen.\n" Binary files /tmp/tmpgG_yti/_LIa6Zit4J/cryptmount-5.3.1/po/fr.gmo and /tmp/tmpgG_yti/RZJciKkzK_/cryptmount-5.3.2/po/fr.gmo differ diff -Nru cryptmount-5.3.1/po/fr.po cryptmount-5.3.2/po/fr.po --- cryptmount-5.3.1/po/fr.po 2019-01-05 14:15:32.000000000 +0000 +++ cryptmount-5.3.2/po/fr.po 2019-10-19 07:27:26.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: cryptmount 4.0-1\n" "Report-Msgid-Bugs-To: rwpenney@users.sourceforge.net\n" -"POT-Creation-Date: 2019-01-05 14:15+0000\n" +"POT-Creation-Date: 2019-10-19 08:27+0100\n" "PO-Revision-Date: 2006-04-21 07:51+0100\n" "Last-Translator: RW Penney \n" "Language-Team: French \n" @@ -86,32 +86,37 @@ msgid "Checksum mismatch in keyfile (openssl-compat, ofs=%u,idx=%u)\n" msgstr "Mauvais fichier-clef (openssl-compat, ofs=%u,idx=%u)\n" -#: armour-luks.c:308 armour-luks.c:392 +#: armour-luks.c:217 +#, fuzzy, c-format +msgid "Failed to acquire privileges for LUKS container" +msgstr "Création du périphérique-loop pour le fichier-clef LUKS a echouée\n" + +#: armour-luks.c:310 armour-luks.c:394 #, fuzzy, c-format msgid "Failed to initialize device for LUKS keyfile\n" msgstr "Création du périphérique-loop pour le fichier-clef LUKS a echouée\n" -#: armour-luks.c:318 +#: armour-luks.c:320 #, c-format msgid "Failed to extract LUKS key for \"%s\" (errno=%d)\n" msgstr "Extraction de la clef LUKS a echouée pour la cible \"%s\" (errno=%d)\n" -#: armour-luks.c:379 +#: armour-luks.c:381 #, c-format msgid "Formatting \"%s\", will probably destroy all existing data" msgstr "Formatage de \"%s\" va detruire tous donnés sur ce conteneur" -#: armour-luks.c:408 +#: armour-luks.c:410 #, c-format msgid "Failed to create LUKS header for \"%s\"\n" msgstr "Génération d'en-tête LUKS pour \"%s\" a echouée\n" -#: armour-luks.c:418 +#: armour-luks.c:420 #, c-format msgid "Failed to create LUKS key for \"%s\"\n" msgstr "Génération de clef LUKS pour \"%s\" a echouée\n" -#: armour-luks.c:431 +#: armour-luks.c:433 #, c-format msgid "Setting password on LUKS keyslot-%u\n" msgstr "" @@ -199,32 +204,32 @@ msgid "Device-mapper target-creation failed for \"%s\"\n" msgstr "Création de la cible device-mapper pour \"%s\" a echouée\n" -#: cryptmount.c:487 cryptmount.c:720 +#: cryptmount.c:488 cryptmount.c:722 #, c-format msgid "Target \"%s\" does not appear to be configured\n" msgstr "La cible \"%s\" n'a pas été configurée\n" -#: cryptmount.c:502 +#: cryptmount.c:503 #, c-format msgid "Cannot stat \"%s\"\n" msgstr "Ne pas pouvoir stat \"%s\"\n" -#: cryptmount.c:510 +#: cryptmount.c:511 #, c-format msgid "Failed to remove device-mapper target \"%s\"\n" msgstr "Destruction de la cible device-mapper \"%s\" a echouée\n" -#: cryptmount.c:543 +#: cryptmount.c:544 #, c-format msgid "Target \"%s\" is already mounted\n" msgstr "La cible \"%s\" est déjà montée\n" -#: cryptmount.c:601 +#: cryptmount.c:602 #, c-format msgid "Target \"%s\" does not appear to be mounted\n" msgstr "La cible \"%s\" n'est pas montée\n" -#: cryptmount.c:611 +#: cryptmount.c:612 #, c-format msgid "Only \"%s\" can unmount \"%s\"\n" msgstr "Seulement utilisateur \"%s\" peut démonter \"%s\"\n" @@ -232,123 +237,123 @@ #. TRANSLATORS: the following expands to include #. the *numerical* user-identity in place of '%lu', #. e.g. giving 'only user-16 can unmount "target"': -#: cryptmount.c:617 +#: cryptmount.c:618 #, c-format msgid "Only user-%lu can unmount \"%s\"\n" msgstr "Seulement utilisateur-%lu peut démonter \"%s\"\n" -#: cryptmount.c:661 +#: cryptmount.c:663 #, fuzzy, c-format msgid "Target \"%s\" is already configured\n" msgstr "La cible \"%s\" est déjà montée\n" -#: cryptmount.c:684 cryptmount.c:740 +#: cryptmount.c:686 cryptmount.c:742 #, c-format msgid "Crypto-swap is not supported by this installation of cryptmount\n" msgstr "" "Pagination chiffrée n'est pas possible avec cet installation de cryptmount\n" -#: cryptmount.c:772 +#: cryptmount.c:774 #, c-format msgid "Key-file for \"%s\" isn't password-protected\n" msgstr "Le fichier-clef pour \"%s\" n'est pas protèger par mot de passe\n" -#: cryptmount.c:798 cryptmount.c:919 +#: cryptmount.c:800 cryptmount.c:921 #, c-format msgid "Cannot open \"%s\" for writing\n" msgstr "Ne pas pouvoir ecrire à \"%s\"\n" -#: cryptmount.c:813 +#: cryptmount.c:815 #, c-format msgid "Retiring old key (%s -> %s) failed\n" msgstr "Retraitment de vielle fichier-clef (%s -> %s) a echouée\n" -#: cryptmount.c:821 +#: cryptmount.c:823 #, c-format msgid "Installing new key (%s -> %s) failed\n" msgstr "Installation de nouvelle fichier-clef (%s -> %s) a echouée\n" -#: cryptmount.c:828 +#: cryptmount.c:830 #, c-format msgid "Backup of previous key is in \"%s\"\n" msgstr "Une sauvegarde de l'ancienne clef est dans \"%s\"\n" -#: cryptmount.c:868 cryptmount.c:1545 +#: cryptmount.c:870 cryptmount.c:1547 #, c-format msgid "Target name \"%s\" is not recognized\n" msgstr "Nom de cible \"%s\" n'est pas reconnu\n" -#: cryptmount.c:874 +#: cryptmount.c:876 #, c-format msgid "Bad key-length parameter" msgstr "Mauvaise paramètre pour la taille de la clef" -#: cryptmount.c:886 +#: cryptmount.c:888 #, c-format msgid "Key-file \"%s\" already exists for target \"%s\"\n" msgstr "Le fichier-clef \"%s\" existe déjà pour la cible \"%s\"\n" -#: cryptmount.c:896 +#: cryptmount.c:898 #, c-format msgid "Generating random key; please be patient...\n" msgstr "Veuillez attendre pendant la création d'une clef aléatoire...\n" -#: cryptmount.c:900 +#: cryptmount.c:902 #, c-format msgid "Failed to generate new key\n" msgstr "Génération de nouvelle clef a echouée\n" -#: cryptmount.c:933 +#: cryptmount.c:935 #, c-format msgid "Installation of new keyfile \"%s\" failed" msgstr "Installation de novelle fichier-clef \"%s\" a echouée" -#: cryptmount.c:1069 +#: cryptmount.c:1071 #, c-format msgid "Only root can use option \"%s\"\n" msgstr "Seulement le super-utilisateur peut utiliser \"%s\"\n" -#: cryptmount.c:1082 +#: cryptmount.c:1084 #, c-format msgid "Only root can configure \"%s\"\n" msgstr "Seulement le super-utilisateur peut configurer \"%s\"\n" -#: cryptmount.c:1146 +#: cryptmount.c:1148 #, c-format msgid "Cannot find key-manager to match target \"%s\"\n" msgstr "Ne peut pas trouver un diriger-clef pour la cible \"%s\"\n" -#: cryptmount.c:1413 +#: cryptmount.c:1415 #, c-format msgid "Multiple operating modes not supported\n" msgstr "" -#: cryptmount.c:1468 +#: cryptmount.c:1470 #, c-format msgid "Memory-locking failed...\n" msgstr "Verrouillage de la memoire a echoué...\n" -#: cryptmount.c:1496 +#: cryptmount.c:1498 #, c-format msgid "Bad file-descriptor (%d)\n" msgstr "Maivais descripteur de fichier (%d)\n" -#: cryptmount.c:1506 +#: cryptmount.c:1508 #, c-format msgid "Security failure\n" msgstr "Echec de securité\n" -#: cryptmount.c:1525 +#: cryptmount.c:1527 #, c-format msgid "Trailing command-line arguments given with '--all' option\n" msgstr "Arguments donnés après option '--all'\n" -#: cryptmount.c:1557 +#: cryptmount.c:1559 #, c-format msgid "Target security failure for \"%s\"\n" msgstr "Echec de securité pour cible \"%s\"\n" -#: cryptmount.c:1566 +#: cryptmount.c:1568 #, c-format msgid "No targets specified\n" msgstr "Pas de cible donnée\n" @@ -367,17 +372,17 @@ "Périphérique \"%s\" semble contenir des données valable (entropy=%.3g,%.3g) " "- veuillez utiliser mkswap manuellement\n" -#: looputils.c:225 +#: looputils.c:226 #, c-format msgid "Failed to free device (%d,%d)\n" msgstr "Dégagement du périphérique (%d,%d) a echoué\n" -#: looputils.c:261 +#: looputils.c:262 #, c-format msgid "No available loopback devices\n" msgstr "Il n'y a aucun périph-loop disponible\n" -#: looputils.c:275 +#: looputils.c:276 #, c-format msgid "Bad device type (%x) for \"%s\" (need block/file)\n" msgstr "" @@ -761,9 +766,6 @@ #~ msgid "target name \"%s\" is not recognized\n" #~ msgstr "nom de cible \"%s\" n'est pas reconnu\n" -#~ msgid "Failed to create loop device for LUKS keyfile" -#~ msgstr "Création du périphérique-loop pour le fichier-clef LUKS a echouée\n" - #~ msgid "key-extraction failed for \"%s\"\n" #~ msgstr "extraction de la clef pour \"%s\" a echouée\n" diff -Nru cryptmount-5.3.1/README cryptmount-5.3.2/README --- cryptmount-5.3.1/README 2019-01-05 14:21:54.000000000 +0000 +++ cryptmount-5.3.2/README 2019-11-09 11:39:06.000000000 +0000 @@ -52,7 +52,7 @@ cryptmount has been tested (using the "mudslinger" script in the 'testing' sub-directory) on a variety of GNU/Linux platforms including: -Debian 9.0, Ubuntu 16.04, Fedora 27, SuSE 13.2 etc. +Debian 9.0, Ubuntu 18.04, CentOS 7.6, ArchLinux etc. For the most recent version of cryptmount, please see http://www.sourceforge.net/projects/cryptmount @@ -168,4 +168,3 @@ rwpenney@users.sourceforge.net Any feedback (including the associated log-file) from running the "mudslinger" tests on any systems not listed above would be particularly helpful. - diff -Nru cryptmount-5.3.1/README.OpenSSL cryptmount-5.3.2/README.OpenSSL --- cryptmount-5.3.1/README.OpenSSL 2010-06-04 14:55:50.000000000 +0000 +++ cryptmount-5.3.2/README.OpenSSL 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ - cryptmount usage of the OpenSSL cryptographic library - - RW Penney, July 2007 - -Introduction -============ - -Since the earliest versions of cryptmount, the package has benefited enormously from the availability of the OpenSSL cryptographic library. This library has provided a secure means of storing filesystem access keys. Moreover, this has provided compatibility with the 'openssl' command-line tool, allowing cryptmount keys to be manipulated outside cryptmount. - -Since mid-2006, cryptmount has added support for access-keys protected via the GNU/libgcrypt library, and more recently has directly incorporated implementations of the Blowfish & SHA1 cryptographic algorithms. - -Despite the power offered by the OpenSSL library, the licencing position of cryptmount is made more complicated by using the OpenSSL library within an application released under the GNU General Public License (GPL2). Although the advice published at http://www.openssl.org/support/faq.html#LEGAL2 recognizes this as accepted "on many systems including the major Linux and BSD distributions", this position is open to disagreement. - -In order to clarify the licencing position of cryptmount, a decision has been taken to REMOVE SUPPORT FOR USING THE OpenSSL LIBRARY from cryptmount-3.0 and subsequent releases. Naturally, this decision has been taken with regret, while greatly respecting the considerable role the OpenSSL library has played in cryptmount's evolution. - - -Migration plans -=============== - -In order to minimize the impact of removing support for the OpenSSL library, additional functionality is being added elsewhere within cryptmount starting with release 2.1: - - * Support for OpenSSL file-formats via the libgcrypt library - - * A new '--reuse-key' option for translating between key-formats - -It is expected that the OpenSSL compatibility layer provided via the libgcrypt library will allow the majority of cryptmount users who are already using OpenSSL key-files to migrate transparently to using libgcrypt in place of the OpenSSL library. There are, however, some differences between the functionality offered by these two libraries that may cause difficulties for a small minority of users who have chosen certain cipher/digest options within OpenSSL. - -In cases where it is necessary to change from an existing OpenSSL key-file to another key-format supported by cryptmount without recreating the associated encrypted filesystem, the '--reuse-key' option can be used by the system-administrator to preserve the same access key, but within a different file-format. -In outline, for an existing crypmount target called 'OLD_TARGET', this will involve the following steps: - - Ensuring you have available a version of cryptmount (e.g. 2.1, 2.2) - which supports all the keyformats used by your existing - encrypted filesystems - - Creating a new cryptmount target in the cmtab, using the same parameters - as OLD_TARGET, but with a different target-name ('NEW_TARGET'), - a new key-filename & different keyformat (e.g. 'libgcrypt') - - Using 'cryptmount --reuse-key OLD_TARGET NEW_TARGET' - to migrate the key from OLD_TARGET to NEW_TARGET - - Confirming that 'cryptmount NEW_TARGET' allows the old filesystem - to be mounted correctly - - Removing the OLD_TARGET entry within the cmtab - -A third option involves using the command-line 'openssl' program to extract an existing access-key and then re-encrypt it, again using 'openssl', to use a cipher & message-digest (e.g. aes-256-cbc & sha1) that are suppored by cryptmount's libgcrypt compatibility layer. - - -OpenSSL key-format support via libgcrypt -======================================== - -If cryptmount is configured with the '--with-libgcrypt' option, a compatibility layer is provided for reading keys stored within files created by the OpenSSL library and 'openssl' command-line application. This compatibility-layer can be associated with any cryptmount filesystem by using 'keyformat=openssl-compat' as part of the filesystem's entry within the cmtab (see 'man 5 cmtab'). - -The following cipher & digest algorithm options within OpenSSL are known to work transparently with this compatibility layer: - aes128, aes-128-cbc, aes192, aes192-cbc, aes-192-ecb, aes256, aes-256-cbc - bf, bf-cbc, blowfish - cast, cast5 - des - md4, md5, sha1, rmd160 - -The following cipher & digest algorithm options within OpenSSL are known to cause problems with the compatibility layer: - *-cfb (Ciphers operated in cipher-feedback mode - do not appear to operate consistently.) - rc2 rc2-* rc4 rc4-* (These ciphers are not supported by libgcrypt) - md2 (This digest is not supported by libgcrypt) - sha (This digest is not supported by libgcrypt) - diff -Nru cryptmount-5.3.1/RELNOTES cryptmount-5.3.2/RELNOTES --- cryptmount-5.3.1/RELNOTES 2019-01-05 16:18:21.000000000 +0000 +++ cryptmount-5.3.2/RELNOTES 2019-11-17 09:29:06.000000000 +0000 @@ -1,6 +1,6 @@ - Release notes for cryptmount-5.3.1 + Release notes for cryptmount-5.3.2 - RW Penney, January 2019 + RW Penney, November 2019 Introduction ============ @@ -9,9 +9,9 @@ superuser privileges, and which assists the system-administrator in creating and managing encrypted filesystems & swap-partitions. -cryptmount was written to address differences between the capabilities of -the loopback device of the 2.4/2.6 kernel series and the newer, preferred, -device-mapper mechanisms of kernels since linux-2.6. +cryptmount was originally written because of differences between +the capabilities of the loopback device of the 2.4/2.6 kernel series +and the newer, preferred, device-mapper mechanisms of kernels since linux-2.6. cryptmount automatically performs the various stages of configuring any supporting loopback and device-mapper targets needed to access an encrypted filing system before actually mounting it, but @@ -38,21 +38,21 @@ It has been tested on the following systems: - * Arch Linux (early-Jan-2019) (x86_64) + * Arch Linux (mid-Nov-2019) (x86_64) - * CentOS 7.4 (x86_64) + * CentOS 8.0.1905 (x86_64) - * Debian GNU/Linux 10.x ("buster"/"testing", early-Jan-2019) (x86) + * Debian GNU/Linux 11.x ("bullseye"/"testing", mid_Nov-2019) (x86) - * Debian GNU/Linux 9.6 ("stretch") (x86) + * Debian GNU/Linux 10.2 ("buster") (amd64, x86) - * Debian GNU/Linux 8.10 ("jessie") (x86) + * Debian GNU/Linux 9.11 ("stretch") (x86) - * Fedora 27 (x86_64) + * Debian GNU/Linux 8.11 ("jessie") (x86) - * Gentoo (early-Jan-2019) (x86) + * Gentoo (mid-Nov-2019) (x86) - * Ubuntu 18.04 ("bionic") (x86_64) + * Ubuntu 19.10 ("eoan") (x86_64) Summary of new features in cryptmount-5.2 diff -Nru cryptmount-5.3.1/sysinit/Makefile.in cryptmount-5.3.2/sysinit/Makefile.in --- cryptmount-5.3.1/sysinit/Makefile.in 2019-01-05 14:11:38.000000000 +0000 +++ cryptmount-5.3.2/sysinit/Makefile.in 2019-10-13 07:30:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,7 @@ am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -285,8 +285,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -304,7 +304,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ Binary files /tmp/tmpgG_yti/_LIa6Zit4J/cryptmount-5.3.1/testing/keys/3.1.2_luks_md5_blowfish_0 and /tmp/tmpgG_yti/RZJciKkzK_/cryptmount-5.3.2/testing/keys/3.1.2_luks_md5_blowfish_0 differ Binary files /tmp/tmpgG_yti/_LIa6Zit4J/cryptmount-5.3.1/testing/keys/4.1_luks_ripemd160_twofish_0 and /tmp/tmpgG_yti/RZJciKkzK_/cryptmount-5.3.2/testing/keys/4.1_luks_ripemd160_twofish_0 differ diff -Nru cryptmount-5.3.1/testing/Makefile.in cryptmount-5.3.2/testing/Makefile.in --- cryptmount-5.3.1/testing/Makefile.in 2019-01-05 14:11:38.000000000 +0000 +++ cryptmount-5.3.2/testing/Makefile.in 2019-10-13 07:30:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,7 @@ am__v_at_0 = @ am__v_at_1 = depcomp = -am__depfiles_maybe = +am__maybe_remake_depfiles = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -279,8 +279,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -298,7 +298,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru cryptmount-5.3.1/testing/mudslinger.in cryptmount-5.3.2/testing/mudslinger.in --- cryptmount-5.3.1/testing/mudslinger.in 2019-01-05 14:34:27.000000000 +0000 +++ cryptmount-5.3.2/testing/mudslinger.in 2019-11-17 08:31:18.000000000 +0000 @@ -7,7 +7,7 @@ SU_p="/bin/su -p" TMPDIR=/tmp/cm-$$ CM=../cryptmount -PASSWD="hopeless" +PASSWD="3normouslyComplexPassw0rd,maybe?" # Pair of users, with valid login-shells: USER1=bin USER2=nobody @@ -109,7 +109,7 @@ function mk_ssl_keyfile() { # Syntax: mk_ssl_keyfile ${DD} if=/dev/urandom bs=${1}c count=1 2>/dev/null | \ - openssl enc -e -pass pass:${PASSWD} -md $2 -${3} 2>/dev/null + openssl enc -e -pass pass:"${PASSWD}" -md $2 -${3} 2>/dev/null }; function mkrandshort() { @@ -218,12 +218,12 @@ keyfile=${TMPDIR}/keyfile } EOF rm -f ${TMPDIR}/keyfile - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx}" 2>&3; then test_fail "privilege violation"; return; fi - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key ${len} target${idx} 2>&3; then true; else test_fail make-key; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx}" 2>&3; then test_fail "privilege violation"; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key ${len} target${idx} 2>&3; then true; else test_fail make-key; return; fi if [ ! -f ${TMPDIR}/keyfile ]; then test_fail missing-key; return; fi fllen=`wc -c ${TMPDIR}/keyfile | awk '{printf"%d", $1}'` if [ "${fllen}" -lt "${len}" ]; then test_fail "keyfile size"; return; fi - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3; then test_fail key-overwrite; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then test_fail key-overwrite; return; fi done done test_pass @@ -243,8 +243,8 @@ } EOF 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"; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 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 if mke2fs -q /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi @@ -266,8 +266,8 @@ } EOF 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"; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 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 if mke2fs -q /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi @@ -297,15 +297,15 @@ EOF 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 + 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 if mke2fs -q /dev/mapper/target${idx}; then true; else test_fail "mke2fs" "${cleanup}"; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail "release" "${cleanup}"; return; fi mount -o remount,ro ${TMPDIR}/romnt - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx} 2>&3; then true; else test_fail "mount-ro" "${cleanup}" ; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx} 2>&3; then true; else test_fail "mount-ro" "${cleanup}" ; return; fi wait_udev - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --unmount target${idx} 2>&3; then true; else test_fail "unmount-ro" "${cleanup}" ; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --unmount target${idx} 2>&3; then true; else test_fail "unmount-ro" "${cleanup}" ; return; fi # ideally we should try rw-mounting the filesystem, # and checking that the operation fails, but libdevmapper-1.01 apparently # does not deal well with read-only loopback devices @@ -350,18 +350,18 @@ ${keyline} } EOF - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 1>&3 2>&3; then true; else test_fail "make-key"; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail "prepare"; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 1>&3 2>&3; then true; else test_fail "make-key"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail "prepare"; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail "release"; return; fi rm -f ${TMPDIR}/keyfile-old - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --newpassword ${NEWPASSWD} --change-password target${idx} 1>&3 2>&3; then true; else test_fail "changing password"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --newpassword "${NEWPASSWD}" --change-password target${idx} 1>&3 2>&3; then true; else test_fail "changing password"; return; fi if [ "${mgr}" != "luks" ]; then if [ -f ${TMPDIR}/keyfile-old ]; then rm ${TMPDIR}/keyfile-old; else test_fail "missing backup key"; return; fi fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then test_fail "old password"; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${NEWPASSWD} --prepare target${idx} 2>&3; then true; else test_fail "prepare-new"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then test_fail "old password"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${NEWPASSWD}" --prepare target${idx} 2>&3; then true; else test_fail "prepare-new"; return; fi if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail "release-new"; return; fi wait_udev done @@ -372,11 +372,7 @@ function test_mtab() { # Test of updates to mtab if test_start "mtab updates"; then true; else return; fi - if [ -x /sbin/mkfs.minix ]; then - fstype=minix - else - fstype=ext3 - fi + fstype=ext3 rm -f ${TMPDIR}/keyfile ln -s ./mnt ${TMPDIR}/mnt-link0 ln -s mnt ${TMPDIR}/mnt-link1 @@ -397,8 +393,8 @@ EOF cleanup="rm ${TMPDIR}/mnt-link0 ${TMPDIR}/mnt-link1" echo "variant=\"${variant}\"" >&3 - test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3; - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail "prepare" "${cleanup}" ; return; fi + test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail "prepare" "${cleanup}" ; return; fi if mkfs -t ${fstype} /dev/mapper/target${idx} 1>&3 2>&3; then true; else ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; test_fail "mkfs.${fstype}" "${cleanup}"; return @@ -407,7 +403,7 @@ if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail "release" "${cleanup}" ; return; fi if [ `df -k | grep -c /dev/mapper/target${idx}` -ne 0 ]; then test_fail "pre-existing" "${cleanup}" ; return; fi - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 1>&3 2>&3; then true; else test_fail "mount" "${cleanup}" ; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 1>&3 2>&3; then true; else test_fail "mount" "${cleanup}" ; return; fi if [ `df -k | grep -c "/dev/mapper/target${idx}"` -ne 1 ]; then test_fail "unregistered" "${cleanup}" ; return; fi wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail "unmount" "${cleanup}" ; return; fi @@ -435,7 +431,7 @@ EOF tlist="${tlist} target${idx},/mnt/point-${idx2}" done - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --list" > ${TMPDIR}/tlist 2>&3; then true; else test_fail listing; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --list" > ${TMPDIR}/tlist 2>&3; then true; else test_fail listing; return; fi for marker in ${tlist} do tupelize $marker tgt dir @@ -466,7 +462,7 @@ EOF tlist="${tlist} target${idx},/mnt/point-${idx2},fs-${idx3}" done - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --list" > ${TMPDIR}/tlist 2>&3; then true; else test_fail listing; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --list" > ${TMPDIR}/tlist 2>&3; then true; else test_fail listing; return; fi if [ "`echo ${tlist} | wc -w`" -ne "`wc -l < ${TMPDIR}/tlist`" ]; then test_fail "wrong number of targets"; return fi @@ -498,8 +494,8 @@ } EOF 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"; return; fi - if ${CM} --config-dir ${TMPDIR} --password NOT${PASSWD} --prepare target${idx} 2>&3; then + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then true; else test_fail "key-generation"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "NOT${PASSWD}" --prepare target${idx} 2>&3; then ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3 test_fail prepare else @@ -554,9 +550,9 @@ } EOF rm -f ${TMPDIR}/keyfile - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3; then test_fail "key-generation"; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then test_fail "key-generation"; return; fi ${DD} if=/dev/urandom of=${TMPDIR}/keyfile bs=16c count=1 2>/dev/null - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3 test_fail prepare else @@ -585,7 +581,7 @@ } EOF rm -f ${TMPDIR}/keyfile - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3; then test_fail "key-generation"; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then test_fail "key-generation"; return; fi done done test_pass; @@ -606,9 +602,9 @@ keyfile=${TMPDIR}/keyfile-\$(USERNAME) } EOF - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3; then true; else test_fail "make-key"; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then true; else test_fail "make-key"; return; fi if [ ! -f ${TMPDIR}/keyfile-root ]; then test_fail "missing key"; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail "prepare"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail "prepare"; return; fi if mke2fs -q /dev/mapper/target${idx}; then true; else test_fail "mke2fs"; return; fi if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail "release"; return; fi @@ -617,11 +613,11 @@ echo "user=${user}.${group}" >&3 cp ${TMPDIR}/keyfile-root ${TMPDIR}/keyfile-${user} - if ${SU_p} ${user} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --newpassword ${PASSWD}-${user} --change-password target${idx}" 2>&3; then true; else test_fail "changing password"; return; fi + if ${SU_p} ${user} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --newpassword "${PASSWD}"-${user} --change-password target${idx}" 2>&3; then true; else test_fail "changing password"; return; fi wait_udev mkdir ${TMPDIR}/mnt-${group} - if ${SU_p} ${user} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD}-${user} --mount target${idx}" 2>&3; then true; else test_fail "mount-${user}"; return; fi + if ${SU_p} ${user} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}-${user}" --mount target${idx}" 2>&3; then true; else test_fail "mount-${user}"; return; fi if [ ! -d ${TMPDIR}/mnt-${group}/lost+found ]; then test_fail "lost+found ${user}.${group}"; return; fi if ${SU_p} ${user} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail "mount-${user}"; return; fi done @@ -652,11 +648,11 @@ fstype=ext2 mountoptions=defaults cipher=blowfish keyformat=builtin keyfile=${TMPDIR}/keyfile } EOF - test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3 + test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3 pos=`expr ${pos} + ${fsz}` done cleanup="${CM} --config-dir ${TMPDIR} --release --all" - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare --all 2>&3; then true; else test_fail "prepare" "${cleanup}"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare --all 2>&3; then true; else test_fail "prepare" "${cleanup}"; return; fi for tgt in ${tgtlist}; do ${DD} if=/dev/zero of=/dev/mapper/target${idx} bs=1M count=1 2>/dev/null if mke2fs -q /dev/mapper/${tgt}; then true; else test_fail mke2fs; return; fi @@ -667,7 +663,7 @@ done srtlist=`echo ${tgtlist} | awk '{for (i=1; i<=NF; ++i) printf"%s\n",\$i}' | sort` for tgt in ${srtlist}; do - ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount ${tgt}" 2>&3 & + ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount ${tgt}" 2>&3 & done wait cat ${TMPDIR}/cryptmount.status 1>&3 @@ -699,13 +695,13 @@ } EOF 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"; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 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 if mke2fs -q -j /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 1>&3 2>&3; then true; else test_fail "mount"; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 1>&3 2>&3; then true; else test_fail "mount"; return; fi wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail "unmount"; return; fi @@ -746,7 +742,7 @@ } EOF rm -f ${TMPDIR}/keyfile - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi ${DD} if=/dev/zero of=/dev/mapper/target${idx} bs=1M count=1 2>/dev/null if mke2fs -q /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev @@ -754,7 +750,7 @@ wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "not-${PASSWD}" --mount target${idx}" 2>&3; then test_fail "bad-password"; return; fi - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 2>&3; then true; else test_fail "mount"; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 2>&3; then true; else test_fail "mount"; return; fi if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail "unmount"; return; fi wait_udev done @@ -784,13 +780,13 @@ keyhash=${keyhash} keycipher=${keycipher} } EOF - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi ${DD} if=/dev/zero of=/dev/mapper/target${idx} bs=1M count=1 2>/dev/null if mke2fs -q -j /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail unmount; return; fi @@ -823,14 +819,14 @@ } EOF 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"; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 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 ${DD} if=/dev/zero of=/dev/mapper/target${idx} bs=1M count=1 2>/dev/null if mke2fs -q -j /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail "unmount"; return; fi @@ -871,7 +867,7 @@ } EOF # Configure filesystem with libgcrypt-openssl compatibility layer: - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi ${DD} if=/dev/zero of=/dev/mapper/target${idx} bs=1M count=1 2>/dev/null if mke2fs -q -j /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev @@ -888,7 +884,7 @@ q EOF fi - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail unmount; return; fi @@ -912,13 +908,13 @@ } EOF rm -f ${TMPDIR}/keyfile - if ${CM} --config-dir ${TMPDIR} --generate-key 32 --newpassword ${PASSWD} target${idx} 2>&3; then true; else test_fail make-key; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --generate-key 32 --newpassword "${PASSWD}" target${idx} 2>&3; then true; else test_fail make-key; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi if mke2fs -q -j /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 2>&3; then true; else test_fail mount; return; fi if ${SU_p} ${USER2} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then test_fail bad-unmount; return; fi if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --unmount target${idx}" 2>&3; then true; else test_fail unmount; return; fi @@ -940,8 +936,8 @@ } EOF rm -f ${TMPDIR}/keyfile - if ${CM} --config-dir ${TMPDIR} --generate-key 16 --newpassword ${PASSWD} target${idx} 2>&3; then true; else test_fail make-key; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --generate-key 16 --newpassword "${PASSWD}" target${idx} 2>&3; then true; else test_fail make-key; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi if mke2fs -q -j /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi @@ -958,14 +954,14 @@ q EOF echo "config: ${cfg}" 1>&3 - ${SU_p} ${usr} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --mount target${idx}" 1>&3 2>&3 + ${SU_p} ${usr} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --mount target${idx}" 1>&3 2>&3 stat=$? if [ \( "$stat" -eq 0 -a "$exp" != "pass" \) -o \( "$stat" -ne 0 -a "$exp" != "fail" \) ]; then test_fail bad-mount return fi wait_udev - ${SU_p} ${usr} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --unmount target${idx}" 2>&3 + ${SU_p} ${usr} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --unmount target${idx}" 2>&3 stat=$? if [ \( "$stat" -eq 0 -a "$exp" != "pass" \) -o \( "$stat" -ne 0 -a "$exp" != "fail" \) ]; then test_fail bad-unmount @@ -991,8 +987,8 @@ } EOF rm -f ${TMPDIR}/keyfile - if ${CM} --config-dir ${TMPDIR} --generate-key 12 --newpassword ${PASSWD} target${idx} 2>&3; then true; else test_fail make-key; return; fi - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + if ${CM} --config-dir ${TMPDIR} --generate-key 12 --newpassword "${PASSWD}" target${idx} 2>&3; then true; else test_fail make-key; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi if mke2fs -q -j /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi @@ -1001,7 +997,7 @@ for unmopt in "-u" "--unmount" do echo "mount[${mntopt}] unmount[${unmopt}]" 1>&3 - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} ${mntopt} target${idx}" 2>&3; then true; else test_fail mount; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" ${mntopt} target${idx}" 2>&3; then true; else test_fail mount; return; fi wait_udev if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} ${unmopt} target${idx}" 2>&3; then true; else test_fail unmount; return; fi @@ -1032,10 +1028,10 @@ keyfile=${TMPDIR}/keyfile } EOF - test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3 + 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 sync - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then cleanup="${CM} --config-dir ${TMPDIR} --release target${idx}" ${DD} if=/dev/zero of=/dev/mapper/target${idx} bs=1b count=`expr ${length} + 16` 2>&3 wait_udev @@ -1090,9 +1086,9 @@ ${DD} if=$0 of=${LOOPDEV} bs=1M count=4 2>/dev/null ;; esac wait_udev; sync - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} --swapon swap${idx}" 2>&3; then test_fail privilege; return; fi + if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --swapon swap${idx}" 2>&3; then test_fail privilege; return; fi if grep -q swap${idx} /proc/swaps; then test_fail pre-existing; return; fi - ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --swapon swap${idx} 2>&3; + ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --swapon swap${idx} 2>&3; stat=$? echo "stat: $stat" 1>&3 if [ \( "$stat" -eq 0 -a "$exp" != "pass" \) -o \( "$stat" -ne 0 -a "$exp" != "fail" \) ]; then @@ -1105,7 +1101,7 @@ if grep -q "\<${prio}\>" /proc/swaps; then true; else test_fail "proc+swaps"; return; fi # Beware that udev may rename our swap device within /proc/swaps! fi - ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --swapoff swap${idx} 2>&3; + ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --swapoff swap${idx} 2>&3; if [ \( "$stat" -eq 0 -a "$exp" != "pass" \) -o \( "$stat" -ne 0 -a "$exp" != "fail" \) ]; then test_fail swapoff return @@ -1133,16 +1129,16 @@ keyfile=${TMPDIR}/keyfile } EOF - COMMAND="${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx}" + COMMAND="${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx}" if ${COMMAND} 2>&3; then true; else test_fail "key-generation (priv)"; return; fi cp ${TMPDIR}/cmtab ${TMPDIR}/cmstrm cat /dev/null > ${TMPDIR}/cmtab - COMMAND="${CM} --config-dir ${TMPDIR} --password ${PASSWD} --config-fd 5 --prepare target${idx}" + COMMAND="${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --config-fd 5 --prepare target${idx}" if ${SU_p} ${USER1} -c "${COMMAND}" 5< ${TMPDIR}/cmstrm 2>&3; then test_fail "config-fd"; return; fi if ${COMMAND} 5< ${TMPDIR}/cmstrm 2>&3; then true; else test_fail "config-fd (priv)"; return; fi wait_udev - COMMAND="${CM} --config-dir ${TMPDIR} --password ${PASSWD} --config-fd 7 --release target${idx}" + COMMAND="${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --config-fd 7 --release target${idx}" if ${SU_p} ${USER1} -c "${COMMAND}" 7< ${TMPDIR}/cmstrm 2>&3; then test_fail "config-fd"; return; fi if ${COMMAND} 7< ${TMPDIR}/cmstrm 2>&3; then true; else test_fail "config-fd (priv)"; return; fi rm ${TMPDIR}/cmstrm @@ -1173,7 +1169,7 @@ keyfile=${TMPDIR}/keyfile_ keyhash=sha1 keycipher=aes-192-cbc } EOF - COMMAND="${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx}" + COMMAND="${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx}" if ${SU_p} ${USER1} -c "${COMMAND}" 2>&3; then test_fail "key-generation"; return; fi if ${COMMAND} 2>&3; then true; else test_fail "key-generation (priv)"; return; fi COMMAND="${CM} --config-dir ${TMPDIR} --password ${PASSWD} --newpassword ${NEWPASSWD} --reuse-key target${idx} target${idx}_" @@ -1183,7 +1179,7 @@ for action in --prepare --release --swapon --swapoff --safetynet do - COMMAND="${CM} --config-dir ${TMPDIR} --password ${PASSWD} ${action} target${idx}" + COMMAND="${CM} --config-dir ${TMPDIR} --password "${PASSWD}" ${action} target${idx}" if ${SU_p} ${USER1} -c "${COMMAND}" 2>&3; then test_fail "${action}"; return; fi if ${COMMAND} 2>&3; then true; else test_fail "${action} (priv)"; return; fi wait_udev @@ -1210,7 +1206,7 @@ keyfile=${TMPDIR}/keyfile } EOF rm -f ${TMPDIR}/keyfile - ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 1>&3 2>&3 + ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 1>&3 2>&3 stat=$? if [ "$stat" -eq 0 -a "${exp}" == "pass" ]; then obsv=`od -j 7 -N 1 -t d1 ${TMPDIR}/keyfile | sed -n '1s/^[0-9]* *//p'` @@ -1233,16 +1229,12 @@ if which cryptsetup 1>&3; then true; else test_fail "cryptsetup not available"; return; fi if ${CM} --key-managers 2>/dev/null | grep -q openssl; then true; else test_fail "No OpenSSL support"; return; fi mk_ssl_keyfile 32 md5 aes192 > ${TMPDIR}/keyfile - openssl enc -d -aes192 -md md5 -in ${TMPDIR}/keyfile -pass pass:${PASSWD} -out ${TMPDIR}/keymat 2>/dev/null + openssl enc -d -aes192 -md md5 -in ${TMPDIR}/keyfile -pass pass:"${PASSWD}" -out ${TMPDIR}/keymat 2>/dev/null - for cipher in blowfish serpent - do - for length in 4096 8192 - do - for startsec in 0 32 - do - for ivoffset in 0 172 932 - do + for cipher in blowfish serpent; do + for length in 16384 32768; do + for startsec in 0 32; do + for ivoffset in 0 172 932; do idx=`mkrandshort` echo "${cipher},${length},${startsec},${ivoffset}" 1>&3 cryptsetup --key-file ${TMPDIR}/keymat -c ${cipher} -b ${length} -o ${startsec} -p ${ivoffset} create cstarget${idx} ${LOOPDEV} 2>&3 @@ -1272,9 +1264,9 @@ keyhash=md5 keycipher=aes192 } EOF - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} target${idx} 2>&3; then true; else test_fail "mount"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" target${idx} 2>&3; then true; else test_fail "mount"; return; fi wait_udev - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --unmount target${idx} 2>&3; then true; else test_fail "unmount"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --unmount target${idx} 2>&3; then true; else test_fail "unmount"; return; fi done done done @@ -1296,16 +1288,16 @@ fstype=ext3 flags=nofsck } EOF - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 32 target${idx} 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 + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 32 target${idx} 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 if mke2fs -t ext3 -q /dev/mapper/target${idx}; then true; else test_fail mke2fs; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail release; return; fi wait_udev - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} target${idx}" 2>&3; then true; else test_fail "mount"; return; fi + 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 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} --password ${PASSWD} --newpassword ${NEWPASSWD} --change-password target${idx} 1>&3 2>&3; then true; else test_fail "changing password"; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --newpassword ${NEWPASSWD} --change-password target${idx} 1>&3 2>&3; then true; else test_fail "changing password"; return; fi test_pass }; @@ -1345,10 +1337,10 @@ cipher=aes # This should be overridden by LUKS header } EOF - if ${SU_p} ${USER1} -c "${CM} --config-dir ${TMPDIR} --password ${PASSWD} target${idx}" 2>&3; then true; else test_fail "mount"; return; fi + 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 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 + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then test_fail "re-formatting"; fi wait_udev done rm ${TMPDIR}/keymat0 ${TMPDIR}/keymat @@ -1378,10 +1370,10 @@ cipher=${cipher}-${mode} } EOF - 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=4k count=4 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 + 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 if mke2fs -q /dev/mapper/target${idx}; then true; else test_fail "mke2fs"; return; fi wait_udev if ${CM} --config-dir ${TMPDIR} --release target${idx} 2>&3; then true; else test_fail "release"; return; fi @@ -1402,7 +1394,7 @@ if [ "$mode" != "$luksmode" ]; then test_fail "mode mismatch ($luksmode)"; return; fi # Check that re-formatting is blocked: - if ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3; then test_fail "re-formatting"; fi + if ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3; then test_fail "re-formatting"; fi wait_udev done rm ${TMPDIR}/keymat @@ -1430,13 +1422,13 @@ keyfile=${TMPDIR}/keyfile keyformat=raw } EOF - test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword ${PASSWD} --generate-key 16 target${idx} 2>&3 - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi + test -f ${TMPDIR}/keyfile || ${CM} --config-dir ${TMPDIR} --newpassword "${PASSWD}" --generate-key 16 target${idx} 2>&3 + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --prepare target${idx} 2>&3; then true; else test_fail prepare; return; fi wait_udev if ${LOSETUP} $ldev 1>&3 2>&3; then - if ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --release target${idx} 2>&3; then true; else test_fail release; return; fi + if ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --release target${idx} 2>&3; then true; else test_fail release; return; fi else - ${CM} --config-dir ${TMPDIR} --password ${PASSWD} --release target${idx} 2>&3 + ${CM} --config-dir ${TMPDIR} --password "${PASSWD}" --release target${idx} 2>&3 test_fail "loopback unconfigured"; return fi diff -Nru cryptmount-5.3.1/utils.c cryptmount-5.3.2/utils.c --- cryptmount-5.3.1/utils.c 2019-01-05 14:04:12.000000000 +0000 +++ cryptmount-5.3.2/utils.c 2019-01-06 08:40:00.000000000 +0000 @@ -235,11 +235,11 @@ char *cm_strdup(const char *orig) /** Make duplicate of existing string, allocating memory for copy */ -{ char *cpy; +{ char *cpy = NULL; if (orig == NULL) return NULL; - cpy = (char*)malloc((size_t)(strlen(orig) + 1)); + cpy = (char*)malloc(strlen(orig) + 1); return strcpy(cpy, orig); }