summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2018-02-08 00:59:56 +0000
committerjhb <jhb@FreeBSD.org>2018-02-08 00:59:56 +0000
commit4eee6967846d346f0fbddd7ef48808bcaebbb812 (patch)
tree76519645a1414a8234e8561ea3afd027a75b91aa /tests
parentd5e5ba1ce0acbe1ae68944b4cb9e6a112465bf67 (diff)
downloadFreeBSD-src-4eee6967846d346f0fbddd7ef48808bcaebbb812.zip
FreeBSD-src-4eee6967846d346f0fbddd7ef48808bcaebbb812.tar.gz
MFC 319454: Honor the requested crid when running a test.
Otherwise, the kernel is free to choose an aribtrary crypto device rather than the requested device subverting tests that force the use of a specific device.
Diffstat (limited to 'tests')
-rw-r--r--tests/sys/opencrypto/cryptodev.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/sys/opencrypto/cryptodev.py b/tests/sys/opencrypto/cryptodev.py
index d9f764a..afe075d 100644
--- a/tests/sys/opencrypto/cryptodev.py
+++ b/tests/sys/opencrypto/cryptodev.py
@@ -173,10 +173,7 @@ class Crypto:
if not cipher and not mac:
raise ValueError('one of cipher or mac MUST be specified.')
- ses.crid = CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE
- #ses.crid = CRYPTOCAP_F_HARDWARE
- #ses.crid = CRYPTOCAP_F_SOFTWARE
- #ses.crid = 0
+ ses.crid = crid
#print `ses`
s = array.array('B', ses.pack_hdr())
#print `s`
OpenPOWER on IntegriCloud