Re-enable IDEA (rhbz#1003052) and SRP-6.

This commit is contained in:
Thomas Moschny 2013-09-03 19:53:33 +02:00
parent f2a104bfae
commit 89956fd8c9
4 changed files with 6 additions and 8 deletions

View File

@ -1,7 +1,6 @@
For legal reasons, the following modules have been completely removed For legal reasons, the following modules have been completely removed
from the Botan package in Fedora: from the Botan package in Fedora:
* IDEA Block Cipher [src/block/idea, src/block/idea_sse2]
* RC5 Block Cipher [src/block/rc5] * RC5 Block Cipher [src/block/rc5]
* RC6 Block Cipher [src/block/rc6] * RC6 Block Cipher [src/block/rc6]
* GF(p) Math [src/math/ec_gfp] * GF(p) Math [src/math/ec_gfp]
@ -10,4 +9,3 @@ from the Botan package in Fedora:
* ECDH [src/pubkey/ecdh] * ECDH [src/pubkey/ecdh]
* ECDSA [src/pubkey/ecdsa] * ECDSA [src/pubkey/ecdsa]
* GOST 34.10 [src/pubkey/gost_3410] * GOST 34.10 [src/pubkey/gost_3410]
* SRP-6 [src/constructs/srp6]

View File

@ -2,7 +2,7 @@
Name: botan Name: botan
Version: %{major_version}.5 Version: %{major_version}.5
Release: 3%{?dist} Release: 4%{?dist}
Summary: Crypto library written in C++ Summary: Crypto library written in C++
Group: System Environment/Libraries Group: System Environment/Libraries
@ -159,12 +159,15 @@ make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
# these checks would fail # these checks would fail
mv checks/validate.dat{,.orig} mv checks/validate.dat{,.orig}
awk '/\[.*\]/{f=0} /\[(RC5.*|RC6|IDEA.*)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \ awk '/\[.*\]/{f=0} /\[(RC5.*|RC6)\]/{f=1} (f && !/^#/){sub(/^/,"#")} {print}' \
checks/validate.dat.orig > checks/validate.dat checks/validate.dat.orig > checks/validate.dat
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
%changelog %changelog
* Tue Sep 3 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.5-4
- Re-enable IDEA (rhbz#1003052) and SRP-6.
* Sat Jul 27 2013 pmachata@redhat.com - 1.10.5-3 * Sat Jul 27 2013 pmachata@redhat.com - 1.10.5-3
- Rebuild for boost 1.54.0 - Rebuild for boost 1.54.0

View File

@ -11,8 +11,6 @@ tmpfile=$(mktemp)
${compr} -cd ${name}${suffix} > ${tmpfile} ${compr} -cd ${name}${suffix} > ${tmpfile}
tar --delete --file=${tmpfile} Botan-${version}/src/block/idea
tar --delete --file=${tmpfile} Botan-${version}/src/block/idea_sse2
tar --delete --file=${tmpfile} Botan-${version}/src/block/rc6 tar --delete --file=${tmpfile} Botan-${version}/src/block/rc6
tar --delete --file=${tmpfile} Botan-${version}/src/block/rc5 tar --delete --file=${tmpfile} Botan-${version}/src/block/rc5
tar --delete --file=${tmpfile} Botan-${version}/src/math/ec_gfp tar --delete --file=${tmpfile} Botan-${version}/src/math/ec_gfp
@ -21,6 +19,5 @@ tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecdh
tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecdsa tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ecdsa
tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ec_group tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/ec_group
tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/gost_3410 tar --delete --file=${tmpfile} Botan-${version}/src/pubkey/gost_3410
tar --delete --file=${tmpfile} Botan-${version}/src/constructs/srp6
${compr} -c ${tmpfile} > ${name}${newsuffix} ${compr} -c ${tmpfile} > ${name}${newsuffix}

View File

@ -1 +1 @@
dcc2a74f56c617add323df4ae175c1a5 Botan-1.10.5.stripped.tbz ac941b269bd6c73ab40b63577482b163 Botan-1.10.5.stripped.tbz