1. Index: security/nss/tests/run_niscc.sh
  2. ===================================================================
  3. RCS file: /cvsroot/mozilla/security/nss/tests/run_niscc.sh,v
  4. retrieving revision 1.7
  5. diff -u -8 -p -r1.7 run_niscc.sh
  6. --- security/nss/tests/run_niscc.sh 13 Jul 2012 20:30:25 -0000 1.7
  7. +++ security/nss/tests/run_niscc.sh 27 Jul 2012 09:23:33 -0000
  8. @@ -445,16 +450,17 @@ ssl_setup_dirs_resigned()
  9. ################################################################################
  10. # NISCC SMIME tests
  11. ################################################################################
  12. niscc_smime()
  13. {
  14. cd "$TEST_OUTPUT"
  15. DATA="$NISCC_HOME/NISCC_SMIME_testcases"
  17. + # create working directory if it's not preset
  18. [ ! -d niscc_smime ] && mkdir -p niscc_smime
  20. export SMIME_CERT_DB_DIR=envDB
  21. export NSS_STRICT_SHUTDOWN=1
  22. export NSS_DISABLE_ARENA_FREE_LIST=1
  23. export LD_LIBRARY_PATH="$TESTLIB"
  25. # Generate .p12 files
  26. @@ -472,65 +478,79 @@ niscc_smime()
  27. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  28. "${TESTBIN}/certutil" -A -d "$SMIME_CERT_DB_DIR" -f password-is-testtest1.txt -i "$DATA/Client.crt" -n Client -t "TC,C,"
  29. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  30. "${TESTBIN}/pk12util" -i ./CA.p12 -d "$SMIME_CERT_DB_DIR" -k password-is-testtest1.txt -W testtest1
  31. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  32. "${TESTBIN}/pk12util" -i ./Client.p12 -d "$SMIME_CERT_DB_DIR" -k password-is-testtest1.txt -W testtest1
  33. fi
  35. - # if p7m-ed-m-files.txt does not exist, then generate it.
  36. - [ -f "$DATA/p7m-ed-m-files.txt" ] && sed "s|^|$DATA/|" "$DATA/p7m-ed-m-files.txt" > p7m-ed-m-files.txt
  37. + ####Enveloped data part#####################################################
  38. + # Use pre-packed p7m-ed-m-files.txt or generate a new one.
  39. export P7M_ED_M_FILES=p7m-ed-m-files.txt
  40. - if [ "$SMALLSET" = "true" ]; then
  41. - [ ! -f "$P7M_ED_M_FILES" ] && find "$DATA"/p7m-ed-m-0* -type f -print | head -10 >> "$P7M_ED_M_FILES"
  42. + if [ -f "$DATA/$P7M_ED_M_FILES" ]; then
  43. + # list of files exists in input directory
  44. + # add absolute path to the beginning of each line
  45. + # and put the result to the output (current) directory
  46. + sed "s|^|$DATA/|" "$DATA/$P7M_ED_M_FILES" > $P7M_ED_M_FILES
  47. else
  48. - [ ! -f "$P7M_ED_M_FILES" ] && find "$DATA"/p7m-ed-m-0* -type f -print >> "$P7M_ED_M_FILES"
  49. + # create a new list
  50. + find "$DATA"/p7m-ed-m-0* -type f -print > $P7M_ED_M_FILES
  51. + fi
  52. + if [ "$SMALLSET" = "true" ]; then
  53. + # test only a small set => delete all but first ten lines of the file
  54. + sed -i '1,10!d' $P7M_ED_M_FILES
  55. fi
  57. # Test "p7m-ed-m*" testcases
  58. echo "Testing SMIME enveloped data testcases"
  59. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  60. "${TESTBIN}/cmsutil" $VERBOSE -D -d "$SMIME_CERT_DB_DIR" -p testtest1 -b -i "$P7M_ED_M_FILES" > niscc_smime/p7m-ed-m-results.txt 2>&1
  62. + ####Detached signed data part###############################################
  63. export SMIME_CERT_DB_DIR=sigDB
  64. # Generate sigDB if needed
  65. if [ ! -d "$SMIME_CERT_DB_DIR" ]; then
  66. mkdir -p "$SMIME_CERT_DB_DIR"
  67. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  68. "${TESTBIN}/certutil" -N -d "$SMIME_CERT_DB_DIR" -f password-is-testtest1.txt
  69. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  70. "${TESTBIN}/certutil" -A -d "$SMIME_CERT_DB_DIR" -i "$DATA/CA.crt" -n CA -t "TC,C,"
  71. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  72. "${TESTBIN}/certutil" -A -d "$SMIME_CERT_DB_DIR" -i "$DATA/Client.crt" -n Client -t "TC,C,"
  73. fi
  75. - # if p7m-sd-dt-files.txt does not exist, then generate it.
  76. - [ -f "$DATA/p7m-sd-dt-files.txt" ] && sed "s|^|$DATA/|" "$DATA/p7m-sd-dt-files.txt" > p7m-sd-dt-files.txt
  77. + # Use pre-packed p7m-ed-m-files.txt or generate a new one.
  78. export P7M_SD_DT_FILES=p7m-sd-dt-files.txt
  79. - if [ "$SMALLSET" = "true" ]; then
  80. - [ ! -f "$P7M_SD_DT_FILES" ] && find "$DATA"/p7m-sd-dt-[cm]-* -type f -print | head -10 >> "$P7M_SD_DT_FILES"
  81. + if [ -f "$DATA/$P7M_SD_DT_FILES" ]; then
  82. + sed "s|^|$DATA/|" "$DATA/$P7M_SD_DT_FILES" > $P7M_SD_DT_FILES
  83. else
  84. - [ ! -f "$P7M_SD_DT_FILES" ] && find "$DATA"/p7m-sd-dt-[cm]-* -type f -print >> "$P7M_SD_DT_FILES"
  85. + find "$DATA"/p7m-sd-dt-[cm]-* -type f -print > $P7M_SD_DT_FILES
  86. + fi
  87. + if [ "$SMALLSET" = "true" ]; then
  88. + sed -i '1,10!d' $P7M_SD_DT_FILES
  89. fi
  91. [ ! -f detached.txt ] && touch detached.txt
  93. # Test "p7m-sd-dt*" testcases
  94. echo "Testing SMIME detached signed data testcases"
  95. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  96. "${TESTBIN}/cmsutil" $VERBOSE -D -d "$SMIME_CERT_DB_DIR" -c detached.txt -b -i "$P7M_SD_DT_FILES" > niscc_smime/p7m-sd-dt-results.txt 2>&1
  98. - # if p7m-sd-op-files.txt does not exist, then generate it.
  99. - [ -f "$DATA/p7m-sd-op-files.txt" ] && sed "s|^|$DATA/|" "$DATA/p7m-sd-op-files.txt" > p7m-sd-op-files.txt
  100. + ####Opaque signed data part#################################################
  101. + # Use pre-packed p7m-ed-m-files.txt or generate a new one.
  102. export P7M_SD_OP_FILES=p7m-sd-op-files.txt
  103. - if [ "$SMALLSET" = "true" ]; then
  104. - [ ! -f "$P7M_SD_OP_FILES" ] && find "$DATA"/p7m-sd-op-[cm]-* -type f -print | head -10 >> "$P7M_SD_OP_FILES"
  105. + if [ -f "$DATA/$P7M_SD_OP_FILES" ]; then
  106. + sed "s|^|$DATA/|" "$DATA/$P7M_SD_OP_FILES" > $P7M_SD_OP_FILES
  107. else
  108. - [ ! -f "$P7M_SD_OP_FILES" ] && find "$DATA"/p7m-sd-op-[cm]-* -type f -print >> "$P7M_SD_OP_FILES"
  109. + find "$DATA"/p7m-sd-op-[cm]-* -type f -print > $P7M_SD_OP_FILES
  110. + fi
  111. + if [ "$SMALLSET" = "true" ]; then
  112. + sed -i '1,10!d' $P7M_SD_OP_FILES
  113. fi
  115. # Test "p7m-sd-op*" testcases
  116. echo "Testing SMIME opaque signed data testcases"
  117. LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
  118. "${TESTBIN}/cmsutil" $VERBOSE -D -d "$SMIME_CERT_DB_DIR" -b -i "$P7M_SD_OP_FILES" > niscc_smime/p7m-sd-op-results.txt 2>&1
  120. unset LD_LIBRARY_PATH