Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Mar 2013 00:10:38 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r248304 - head/tools/regression/pjdfstest/tests
Message-ID:  <201303150010.r2F0AcuB076569@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Fri Mar 15 00:10:38 2013
New Revision: 248304
URL: http://svnweb.freebsd.org/changeset/base/248304

Log:
  Make file name generation to work with both new and old versions of OpenSSL.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/tools/regression/pjdfstest/tests/misc.sh

Modified: head/tools/regression/pjdfstest/tests/misc.sh
==============================================================================
--- head/tools/regression/pjdfstest/tests/misc.sh	Fri Mar 15 00:05:50 2013	(r248303)
+++ head/tools/regression/pjdfstest/tests/misc.sh	Fri Mar 15 00:10:38 2013	(r248304)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303150010.r2F0AcuB076569>