From 6a3a5ab46f4d3baddb7366595ddc6b9990aaf9f4eebfce2dbb0c6375b58fc74b Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 9 Feb 2018 15:48:12 +0000 Subject: [PATCH] Accepting request 574741 from home:AndreasStieger:branches:security untested 2.0.1 OBS-URL: https://build.opensuse.org/request/show/574741 OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=139 --- cryptsetup-2.0.0.tar.sign | 16 ---------------- cryptsetup-2.0.0.tar.xz | 3 --- cryptsetup-2.0.1.tar.sign | 16 ++++++++++++++++ cryptsetup-2.0.1.tar.xz | 3 +++ cryptsetup.changes | 22 ++++++++++++++++++++++ cryptsetup.spec | 16 ++++++---------- 6 files changed, 47 insertions(+), 29 deletions(-) delete mode 100644 cryptsetup-2.0.0.tar.sign delete mode 100644 cryptsetup-2.0.0.tar.xz create mode 100644 cryptsetup-2.0.1.tar.sign create mode 100644 cryptsetup-2.0.1.tar.xz diff --git a/cryptsetup-2.0.0.tar.sign b/cryptsetup-2.0.0.tar.sign deleted file mode 100644 index 0ae6cd9..0000000 --- a/cryptsetup-2.0.0.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlotl/IACgkQ2bBXe9k+ -mPyUNw/8CCVoZn4zezBAS6vLU6mjBi1exyx8gWSKP9h1Th1TTpGOSMudycECTfVf -u9pPftpbprzu5Exrvdyp2aTAjoA9an0tE45O3PwV9f51a292hw44kA0TzfUB7sgi -BNX+KZAhgi4xAfxmpXFlLycheiQ/PnIHDyEogrOe567R7B8zHMbmRAKlY4ZNxfMh -Ppru7RAEwv1CVluRjFggxE9JZNJvXCjHalORAufFCpmQE3cbqTd7qEIa1lRbzEUA -RRrixas2WsRaPVnLm3MFII/ov5mkneWYxebithzkUKpXQc/WFhN8nG748YXWOxMT -Zgi/M+tl1HUlsxhH5Z/z/2m2pWSy5UY5L07dKyFp5u3ut5n/aQAaAzcT+tfGHXW7 -MG6JlImDcCqqNovN6FsJfuf+NDsAiQ9WMbimWk1IQPR59E/ipKEhXyXEtnBpC1hI -VGQcAEcZNFwoObqV+/NRYfrn8ARANohU/eytotggmnrt3hGjq2LrreWehBXllZtk -ZiRJtPpRSjUZASd6WvfrAspevXF/BjOCvUlEhMWgX20v6RViWaP+UdF+ovfWmLMZ -Y8w+lKMKeSHwIBfdqbsvKCszbn486OsIVUxXbz5T60ozjn58grVYhhzvl/GBpzd1 -O2dE+k1PzrbK0mCnieitGNVXEJxVa78ZTRLQa3GAhovec+AnXvk= -=iHFN ------END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.0.tar.xz b/cryptsetup-2.0.0.tar.xz deleted file mode 100644 index d645544..0000000 --- a/cryptsetup-2.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199 -size 10079936 diff --git a/cryptsetup-2.0.1.tar.sign b/cryptsetup-2.0.1.tar.sign new file mode 100644 index 0000000..d8195f4 --- /dev/null +++ b/cryptsetup-2.0.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlpkfDAACgkQ2bBXe9k+ +mPxsUA//dMQaPwqITtohSntd+xGobT4uvlL/7B7MzD+61wSSh0gEk5wkpGkF4laL +7ai9JL9j2t0djBtCykFgke6VoWupZze9cSlOm/CV227wdBSwdOFo/Y5MlEWNozoT +JS1il/TM/egsxAt6GN7jUYPJ/TtcaFaLIZWXEb+xAT91Ep5FAL4Kpeu5Jd6m2hA0 +tWy3JtPeICp7z2gNvrb5bid3CzHTE6y5fgK5hoLtHQASCOvDUrEtCCuB+6USqtS1 +3dZ4uhm1p+MuEgSo5K4OZfbc0lT56qtIdnrqD+HveRJUbeqyBhaj71SSJgmfE+Em +AS07LlZwqwozKopK4/e97Nq8PHAidj6NNbWBXs8cWidzAQCAo3y0yTfAVQsj0mJh +PRNUOrL9Ev2klNo63swIe121aPitX2ybeIWMNGbdg8NYm8jhYfVUp2jAsP12V2rZ +daFu46t3ZZQwYHKp7jgR83ghj7J7qynqWT+Z3BUoNg+vvD5d5ZWJTvxEOgSvzkle +HjkJoW0bZoCvzzArVAlMCl5u+JpEGZQe0XCQyzfU1Glkur1EVKdpMvF8OusjtyZb +t6va9N9zDgX3b6BiA9HMB2EWwfXNDICNPEf5dOHPECsLx/tT2+BCtFIlKE7ne2r+ +iwIepRcMYL9kPSu5nTnCpImTWvPNBqJe8vfCaXMZi91H6ZQGwCE= +=WOMG +-----END PGP SIGNATURE----- diff --git a/cryptsetup-2.0.1.tar.xz b/cryptsetup-2.0.1.tar.xz new file mode 100644 index 0000000..db945c4 --- /dev/null +++ b/cryptsetup-2.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41d188092c52e23d576af41cf0cfe0555d8f7efa21598d4c57c56ea1b6d9c975 +size 10110424 diff --git a/cryptsetup.changes b/cryptsetup.changes index 40f0ec7..877d9a0 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 30 12:26:48 UTC 2018 - astieger@suse.com + +- update to 2.0.1: + * To store volume key into kernel keyring, kernel 4.15 with + dm-crypt 1.18.1 is required + * Increase maximum allowed PBKDF memory-cost limit to 4 GiB + * Use /run/cryptsetup as default for cryptsetup locking dir + * Introduce new 64-bit byte-offset *keyfile_device_offset functions. + * New set of fucntions that allows 64-bit offsets even on 32bit systems + are now availeble: + - crypt_resume_by_keyfile_device_offset + - crypt_keyslot_add_by_keyfile_device_offset + - crypt_activate_by_keyfile_device_offset + - crypt_keyfile_device_read + The new functions have added the _device_ in name. + Old functions are just internal wrappers around these. + * Also cryptsetup --keyfile-offset and --new-keyfile-offset now + allows 64-bit offsets as parameters. + * Add error hint for wrongly formatted cipher strings in LUKS1 and + properly fail in luksFormat if cipher format is missing required IV. + ------------------------------------------------------------------- Fri Dec 22 16:16:10 UTC 2017 - archie.cobbs@gmail.com diff --git a/cryptsetup.spec b/cryptsetup.spec index 125dc2c..5f0ebcb 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -18,10 +18,10 @@ %define so_ver 12 Name: cryptsetup -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Set Up dm-crypt Based Encrypted Block Devices -License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ +License: SUSE-GPL-2.0-with-openssl-exception AND LGPL-2.0+ Group: System/Base Url: https://gitlab.com/cryptsetup/cryptsetup/ Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{version}.tar.xz @@ -37,12 +37,12 @@ BuildRequires: libjson-c-devel BuildRequires: libpwquality-devel BuildRequires: libselinux-devel BuildRequires: libuuid-devel -BuildRequires: pkgconfig(libargon2) # 2.6.38 has the required if_alg.h BuildRequires: linux-glibc-devel >= 2.6.38 BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: suse-module-tools +BuildRequires: pkgconfig(libargon2) Requires(post): coreutils Requires(postun): coreutils @@ -108,7 +108,7 @@ make %{?_smp_mflags} V=1 %define __spec_install_post \ %{?__debug_package:%{__debug_install_post}} \ %{__arch_install_post} \ - %{__os_install_post} \ + %__os_install_post \ fipshmac %{buildroot}/%{_libdir}/libcryptsetup.so.* \ %{nil} @@ -141,6 +141,7 @@ if [ "$FIRST_ARG" -gt 1 -a ! -e "$marker" ]; then fi %{?regenerate_initrd_post} +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf %postun %{?regenerate_initrd_post} @@ -152,10 +153,7 @@ fi %postun -n libcryptsetup%{so_ver} -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root) %doc AUTHORS COPYING* FAQ README TODO docs/ChangeLog.old docs/*ReleaseNotes -#ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab -#ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/cryptotab /sbin/cryptsetup %{_sbindir}/cryptsetup %{_sbindir}/veritysetup @@ -166,17 +164,15 @@ fi %{_mandir}/man8/veritysetup.8%{ext_man} %{_mandir}/man8/integritysetup.8%{ext_man} %{_tmpfilesdir}/cryptsetup.conf +%ghost %dir /run/cryptsetup %files -n libcryptsetup%{so_ver} -%defattr(-,root,root) %{_libdir}/libcryptsetup.so.%{so_ver}* %files -n libcryptsetup%{so_ver}-hmac -%defattr(-,root,root) %{_libdir}/.libcryptsetup.so.%{so_ver}*hmac %files -n libcryptsetup-devel -%defattr(-,root,root) %doc docs/examples/ %{_includedir}/libcryptsetup.h %{_libdir}/libcryptsetup.so