Remove uses of CRIOGET in OCF tests after r368005.

Pointy hat to:	jhb
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D27367

3 files changed, 7 insertions, 32 deletions

diff --git a/tests/sys/opencrypto/blake2_test.c b/tests/sys/opencrypto/blake2_test.c
index 384b972f23562..87a518fb78bc2 100644
--- a/tests/sys/opencrypto/blake2_test.c
+++ b/tests/sys/opencrypto/blake2_test.c
@@ -88,17 +88,10 @@ lookup_crid(int fd, const char *devname)
 static int
 get_handle_fd(void)
 {
-	int dc_fd, fd;
+	int fd;
 
-	dc_fd = open("/dev/crypto", O_RDWR);
-
-	/*
-	 * Why do we do this dance instead of just operating on /dev/crypto
-	 * directly?  I have no idea.
-	 */
-	ATF_REQUIRE(dc_fd >= 0);
-	ATF_REQUIRE(ioctl(dc_fd, CRIOGET, &fd) != -1);
-	close(dc_fd);
+	fd = open("/dev/crypto", O_RDWR);
+	ATF_REQUIRE(fd >= 0);
 	return (fd);
 }
 
diff --git a/tests/sys/opencrypto/cryptodev.py b/tests/sys/opencrypto/cryptodev.py
index 0fcca6c002441..83d14fc2b205c 100644
--- a/tests/sys/opencrypto/cryptodev.py
+++ b/tests/sys/opencrypto/cryptodev.py
@@ -115,7 +115,6 @@ class CryptAEAD(dpkt.Packet):
     )
 
 # h2py.py can't handle multiarg macros
-CRIOGET = 3221513060
 CIOCGSESSION = 3224396645
 CIOCFSESSION = 2147771238
 CIOCKEY = 3230688104
@@ -131,17 +130,7 @@ else:
     CIOCCRYPT = 3223085927
     CIOCCRYPTAEAD = 3223872365
 
-def _getdev():
-    buf = array.array('I', [0])
-    fd = os.open('/dev/crypto', os.O_RDWR)
-    try:
-        ioctl(fd, CRIOGET, buf, 1)
-    finally:
-        os.close(fd)
-
-    return buf[0]
-
-_cryptodev = _getdev()
+_cryptodev = os.open('/dev/crypto', os.O_RDWR)
 
 def str_to_ascii(val):
     if sys.version_info[0] >= 3:
diff --git a/tests/sys/opencrypto/poly1305_test.c b/tests/sys/opencrypto/poly1305_test.c
index 64a1f09342638..3687d0c65ec00 100644
--- a/tests/sys/opencrypto/poly1305_test.c
+++ b/tests/sys/opencrypto/poly1305_test.c
@@ -302,17 +302,10 @@ parse_vector(const struct poly1305_kat *kat,
 static int
 get_handle_fd(void)
 {
-	int dc_fd, fd;
+	int fd;
 
-	dc_fd = open("/dev/crypto", O_RDWR);
-
-	/*
-	 * Why do we do this dance instead of just operating on /dev/crypto
-	 * directly?  I have no idea.
-	 */
-	ATF_REQUIRE(dc_fd >= 0);
-	ATF_REQUIRE(ioctl(dc_fd, CRIOGET, &fd) != -1);
-	close(dc_fd);
+	fd = open("/dev/crypto", O_RDWR);
+	ATF_REQUIRE(fd >= 0);
 	return (fd);
 }