summaryrefslogtreecommitdiffstats
path: root/tools/regression/pjdfstest/tests
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2013-03-15 00:10:38 +0000
committerpjd <pjd@FreeBSD.org>2013-03-15 00:10:38 +0000
commite429c799ddba2e76fbcdf399a5e7668214a37791 (patch)
treeb4423f0d40b035c53f7c2d580d81288b6cd941c6 /tools/regression/pjdfstest/tests
parenteff99d73565d57a439048ffddda73da6f304a6b7 (diff)
downloadFreeBSD-src-e429c799ddba2e76fbcdf399a5e7668214a37791.zip
FreeBSD-src-e429c799ddba2e76fbcdf399a5e7668214a37791.tar.gz
Make file name generation to work with both new and old versions of OpenSSL.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'tools/regression/pjdfstest/tests')
-rw-r--r--tools/regression/pjdfstest/tests/misc.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/regression/pjdfstest/tests/misc.sh b/tools/regression/pjdfstest/tests/misc.sh
index 0d3ce35..8978b5f 100644
--- a/tools/regression/pjdfstest/tests/misc.sh
+++ b/tools/regression/pjdfstest/tests/misc.sh
@@ -89,7 +89,7 @@ todo()
namegen()
{
- echo "pjdfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5`"
+ echo "pjdfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | awk '{print $NF}'`"
}
namegen_len()
@@ -98,7 +98,7 @@ namegen_len()
name=""
while :; do
- namepart="`dd if=/dev/urandom bs=64 count=1 2>/dev/null | openssl md5`"
+ namepart="`dd if=/dev/urandom bs=64 count=1 2>/dev/null | openssl md5 | awk '{print $NF}'`"
name="${name}${namepart}"
curlen=`printf "%s" "${name}" | wc -c`
[ ${curlen} -lt ${len} ] || break
OpenPOWER on IntegriCloud