From 311eccc692a2ca70ba4b9de45596436521f9aeb0 Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Mar 02 2014 08:12:04 +0000
Subject: Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash).


---

diff --git a/cryptsetup.spec b/cryptsetup.spec
index e64fa73..3a537c9 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
@@ -18,13 +18,6 @@ Requires: libpwquality >= 1.2.0
 %define upstream_version %{version}
 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-%{upstream_version}.tar.xz
 
-# Unpatched PBKDF2 in gcrypt is slow, disable it and use internal one.
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
-%define configure_pbkdf2 --enable-gcrypt-pbkdf2
-%else
-%define configure_pbkdf2 --disable-gcrypt-pbkdf2
-%endif
-
 %description
 The cryptsetup package contains a utility for setting up
 disk encryption using dm-crypt kernel module.
@@ -48,10 +41,8 @@ Summary: Cryptsetup shared library
 Provides: cryptsetup-luks-libs = %{version}-%{release}
 Obsoletes: cryptsetup-luks-libs < 1.4.0
 Requires: fipscheck-lib%{_isa} >= 1.3.0
-# Need support for empty password in gcrypt PBKDF2 and fixed gcrypt PBKDF2
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
-Requires: libgcrypt >= 1.5.3-3
-%endif
+# Need support for fixed gcrypt PBKDF2 and fixed Whirlpool hash.
+Requires: libgcrypt >= 1.6.1
 
 %description libs
 This package contains the cryptsetup shared library, libcryptsetup.
@@ -149,6 +140,9 @@ install -d %{buildroot}/%{_libdir}/fipscheck
 %clean
 
 %changelog
+* Sun Mar 02 2014 Milan Broz <gmazyland@gmail.com> - 1.6.4-2
+- Require libgcrypt 1.6.1 (with fixed PBKDF2 and Whirlpool hash).
+
 * Thu Feb 27 2014 Milan Broz <gmazyland@gmail.com> - 1.6.4-1
 - Update to cryptsetup 1.6.4.