D21018.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21018.diff
View Options

	Index: head/tests/sys/opencrypto/cryptotest.py
	===================================================================
	--- head/tests/sys/opencrypto/cryptotest.py
	+++ head/tests/sys/opencrypto/cryptotest.py
	@@ -50,9 +50,9 @@
	raise unittest.SkipTest("Missing %s test vectors" % (base))
	return iglob(os.path.join(katdir, base, glob))

	-aesmodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
	+aesmodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]
	desmodules = [ 'cryptosoft0', ]
	-shamodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
	+shamodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]

	def GenTestCase(cname):
	try:
	@@ -500,6 +500,7 @@

	cryptosoft = GenTestCase('cryptosoft0')
	aesni = GenTestCase('aesni0')
	+armv8crypto = GenTestCase('armv8crypto0')
	ccr = GenTestCase('ccr0')
	ccp = GenTestCase('ccp0')

	Index: head/tests/sys/opencrypto/runtests.sh
	===================================================================
	--- head/tests/sys/opencrypto/runtests.sh
	+++ head/tests/sys/opencrypto/runtests.sh
	@@ -60,7 +60,19 @@
	}
	trap cleanup_tests EXIT INT TERM

	-for required_module in nexus/aesni cryptodev; do
	+cpu_type="$(uname -p)"
	+cpu_module=
	+
	+case ${cpu_type} in
	+aarch64)
	+ cpu_module=nexus/armv8crypto
	+ ;;
	+amd64\|i386)
	+ cpu_module=nexus/aesni
	+ ;;
	+esac
	+
	+for required_module in $cpu_module cryptodev; do
	if ! kldstat -q -m $required_module; then
	module_to_load=${required_module#nexus/}
	if ! kldload ${module_to_load}; then