Bug 193386: Patch to fips.sh to use temporary library for mangle test. r=alexei, sr=nelson

security/nss/tests/fips/fips.sh

@@ -174,29 +174,41 @@ fips_140()
   certutil -d ${P_R_FIPSDIR} -K -f ${R_FIPSPWFILE} 2>&1
   html_msg $? 0 "List the FIPS module keys (certutil -K)"
 
-#
+  LIBDIR="${DIST}/${OBJDIR}/lib"
-# This test was interfering with QA running on more than one machine pointing
+  MANGLEDIR="${FIPSDIR}/mangle"
-# to the same binary file. Turn it off for now.
+   
-#
+  # There are different versions of cp command on different systems, some of them 
-#  echo "$SCRIPTNAME: Detect mangled database --------------------------"
+  # copies only symlinks, others doesn't have option to disable links, so there
-#  SOFTOKEN=${DIST}/${OBJDIR}/lib/${DLL_PREFIX}softokn3.${DLL_SUFFIX}
+  # is needed to copy files one by one. 
-#  echo "cp ${SOFTOKEN} ${TMP}/softokn3.sav"
+  echo "mkdir ${MANGLEDIR}"
-#  cp ${SOFTOKEN} ${TMP}/softokn3.sav
+  mkdir ${MANGLEDIR}
-#  echo "mangling ${SOFTOKEN}"
+  for lib in `ls ${LIBDIR}`; do
-#  echo "mangle -i ${SOFTOKEN} -o 60000 -b 5"
+    echo "cp ${LIBDIR}/${lib} ${MANGLEDIR}"
-#  mangle -i ${SOFTOKEN} -o 60000 -b 5 2>&1
+    cp ${LIBDIR}/${lib} ${MANGLEDIR}
-#  if [ $? -eq 0 ]; then
+  done
-#    echo "dbtest -r  -d ${P_R_FIPSDIR} "
+    
-# suppress the expected failure message
+  echo "$SCRIPTNAME: Detect mangled database --------------------------"
-#    dbtest -r  -d ${P_R_FIPSDIR}  > ${TMP}/dbtestoutput.txt 2>&1
+  SOFTOKEN=${MANGLEDIR}/${DLL_PREFIX}softokn3.${DLL_SUFFIX}
-#    html_msg $? 46 "Init NSS with a corrupted library (dbtest -r)"
+
-#    echo "cp ${TMP}/softokn3.sav ${SOFTOKEN}"
+  echo "mangling ${SOFTOKEN}"
-#    cp ${TMP}/softokn3.sav ${SOFTOKEN}
+  echo "mangle -i ${SOFTOKEN} -o 60000 -b 5"
-#  else
+  mangle -i ${SOFTOKEN} -o 60000 -b 5 2>&1
-#    html_msg 0 0 "Skipping corruption test, can't open ${DLL_PREFIX}softokn3.${DLL_SUFFIX}"
+  if [ $? -eq 0 ]; then
-#  fi
+    if [ "${OS_ARCH}" = "WINNT" ]; then
-#  echo "rm ${TMP}/softokn3.sav"
+      DBTEST=`which dbtest`
-#  rm ${TMP}/softokn3.sav
+      echo "PATH=${MANGLEDIR} ${DBTEST} -r -d ${P_R_FIPSDIR}"
+      PATH="${MANGLEDIR}" ${DBTEST} -r -d ${P_R_FIPSDIR} > ${TMP}/dbtestoutput.txt 2>&1
+      RESULT=$?
+    else
+      echo "LD_LIBRARY_PATH=${MANGLEDIR} dbtest -r -d ${P_R_FIPSDIR}"
+      LD_LIBRARY_PATH="${MANGLEDIR}" dbtest -r -d ${P_R_FIPSDIR} > ${TMP}/dbtestoutput.txt 2>&1
+      RESULT=$?
+    fi  
+
+    html_msg ${RESULT} 46 "Init NSS with a corrupted library (dbtest -r)"
+  else
+    html_msg 0 0 "Skipping corruption test, can't open ${DLL_PREFIX}softokn3.${DLL_SUFFIX}"
+  fi
 }
 
 ############################## fips_cleanup ############################
@@ -213,7 +225,6 @@ fips_cleanup()
 ################## main #################################################
 
 fips_init
-
 fips_140
 fips_cleanup