Merge branch 'private-emaldona-crypto-policy-work' of ssh://pkgs.fedoraproject.org/rpms/nss into private-emaldona-crypto-policy-work

This commit is contained in:
Elio Maldonado 2016-06-08 20:32:04 -07:00
commit 404526cfc6
1 changed files with 6 additions and 6 deletions

View File

@ -236,12 +236,6 @@ done
######## Remove portions that need to statically link with libnssutil.a
%{__rm} -rf ./nss/external_tests/util_gtests
pushd nss/tests/ssl
# Create versions of sslcov.txt and sslstress.txt that disable
# tests for non policy compliant ciphers.
cat sslcov.txt| sed -r "s/^([^#].*EXPORT|^[^#].*_WITH_DES_*)/#disabled \1/" > sslcov.noPolicy.txt
cat sslstress.txt| sed -r "s/^([^#].*EXPORT|^[^#].*with MD5)/#disabled \1/" > sslstress.noPolicy.txt
popd
%build
@ -456,6 +450,12 @@ pushd nss
patch -p1 < %{SOURCE28}
popd
fi
pushd nss/tests/ssl
# Create versions of sslcov.txt and sslstress.txt that disable
# tests for non policy compliant ciphers.
cat sslcov.txt| sed -r "s/^([^#].*EXPORT|^[^#].*_WITH_DES_*)/#disabled \1/" > sslcov.noPolicy.txt
cat sslstress.txt| sed -r "s/^([^#].*EXPORT|^[^#].*with MD5)/#disabled \1/" > sslstress.noPolicy.txt
popd
# ****************************************************************
# enable the following line to force a test failure