diff options
| author | slavomir.katuscak%sun.com <devnull@localhost> | 2008-07-28 07:27:58 +0000 |
|---|---|---|
| committer | slavomir.katuscak%sun.com <devnull@localhost> | 2008-07-28 07:27:58 +0000 |
| commit | 47310086471cbc8da622eb32f3b92231e1b7caaf (patch) | |
| tree | 51cdded6f8e1152bb9a38db731cd76f3c4ebcc29 | |
| parent | 706874ea9f0ac0795feaa1fc8d7fc8a802ed8050 (diff) | |
| download | nss-hg-47310086471cbc8da622eb32f3b92231e1b7caaf.tar.gz | |
Bug 401877: Moved noise file generation to separate function. r=julien
| -rw-r--r-- | security/nss/tests/common/init.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/security/nss/tests/common/init.sh b/security/nss/tests/common/init.sh index e16bacff2..8b3bdd9a7 100644 --- a/security/nss/tests/common/init.sh +++ b/security/nss/tests/common/init.sh @@ -119,12 +119,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then echo "fips104" > ${FIPSBADPWFILE} echo "pKcs12fips140" > ${FIPSP12PWFILE} - # NOTE: these keys are only suitable for testing, as this whole thing - # bypasses the entropy gathering. Don't use this method to generate - # keys and certs for product use or deployment. - ps -efl > ${NOISE_FILE} 2>&1 - ps aux >> ${NOISE_FILE} 2>&1 - date >> ${NOISE_FILE} 2>&1 + noise P_SERVER_CADIR=${SERVER_CADIR} P_CLIENT_CADIR=${CLIENT_CADIR} @@ -144,6 +139,17 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then export HOSTDIR } +# Generate noise file + noise() + { + # NOTE: these keys are only suitable for testing, as this whole thing + # bypasses the entropy gathering. Don't use this method to generate + # keys and certs for product use or deployment. + ps -efl > ${NOISE_FILE} 2>&1 + ps aux >> ${NOISE_FILE} 2>&1 + date >> ${NOISE_FILE} 2>&1 + } + # Print selected environment variable (used for backup) env_backup() { |