Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Jul 2019 07:04:26 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r350164 - stable/12/tests/sys/opencrypto
Message-ID:  <201907200704.x6K74QDt019604@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Sat Jul 20 07:04:25 2019
New Revision: 350164
URL: https://svnweb.freebsd.org/changeset/base/350164

Log:
  MFC r349872:
  
  Correct definitions in sys.opencrypto.runtests.main for 32bit platform
  
  Reviewed by:	cem, jhb
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D20894

Modified:
  stable/12/tests/sys/opencrypto/cryptodev.py
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/tests/sys/opencrypto/cryptodev.py
==============================================================================
--- stable/12/tests/sys/opencrypto/cryptodev.py	Sat Jul 20 05:21:13 2019	(r350163)
+++ stable/12/tests/sys/opencrypto/cryptodev.py	Sat Jul 20 07:04:25 2019	(r350164)
@@ -35,6 +35,7 @@ import array
 import dpkt
 from fcntl import ioctl
 import os
+import platform
 import signal
 from struct import pack as _pack
 
@@ -106,14 +107,19 @@ class CryptAEAD(dpkt.Packet):
 # h2py.py can't handle multiarg macros
 CRIOGET = 3221513060
 CIOCGSESSION = 3224396645
-CIOCGSESSION2 = 3225445226
 CIOCFSESSION = 2147771238
-CIOCCRYPT = 3224396647
 CIOCKEY = 3230688104
 CIOCASYMFEAT = 1074029417
 CIOCKEY2 = 3230688107
 CIOCFINDDEV = 3223610220
-CIOCCRYPTAEAD = 3225445229
+if platform.architecture()[0] == '64bit':
+    CIOCGSESSION2 = 3225445226
+    CIOCCRYPT = 3224396647
+    CIOCCRYPTAEAD = 3225445229
+else:
+    CIOCGSESSION2 = 3224396650
+    CIOCCRYPT = 3223085927
+    CIOCCRYPTAEAD = 3223872365
 
 def _getdev():
 	fd = os.open('/dev/crypto', os.O_RDWR)



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