diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2013-04-29 10:33:35 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2013-04-29 10:33:35 -0700 |
| commit | 1228060b17167808a4d8dcd5a78877d533e6037c (patch) | |
| tree | 5449d01aaf6970badfe9348c9729500726757f3e /tests/fips | |
| parent | ccd65ba45849323a43d6614539e075320ee5963b (diff) | |
| download | nss-hg-1228060b17167808a4d8dcd5a78877d533e6037c.tar.gz | |
Bug 835919 - Allow optionally building nss without softoken in the tree, r=rrelyea
Diffstat (limited to 'tests/fips')
| -rwxr-xr-x | tests/fips/fips.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/fips/fips.sh b/tests/fips/fips.sh index 183d01516..4153e61aa 100755 --- a/tests/fips/fips.sh +++ b/tests/fips/fips.sh @@ -233,6 +233,12 @@ fips_140() echo "mangling ${SOFTOKEN}" echo "mangle -i ${SOFTOKEN} -o -8 -b 5" + # If nss was built without softoken use the system installed one. + # It's location must be specified by the package maintainer. + if [ ! -e ${MANGLEDIR}/${DLL_PREFIX}softokn3.${DLL_SUFFIX} ]; then + echo "cp ${SOFTOKEN_LIB_DIR}/${DLL_PREFIX}softokn3.${DLL_SUFFIX} ${MANGLEDIR}" + cp ${SOFTOKEN_LIB_DIR}/${DLL_PREFIX}softokn3.${DLL_SUFFIX} ${MANGLEDIR} + fi ${BINDIR}/mangle -i ${SOFTOKEN} -o -8 -b 5 2>&1 if [ $? -eq 0 ]; then if [ "${OS_ARCH}" = "WINNT" ]; then |