From owner-svn-src-user@freebsd.org Sat Apr 20 16:28:07 2019 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EEAA156C401 for ; Sat, 20 Apr 2019 16:28:07 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A1CEF97A54; Sat, 20 Apr 2019 16:28:06 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7CA7118A00; Sat, 20 Apr 2019 16:28:06 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3KGS6u9062456; Sat, 20 Apr 2019 16:28:06 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KGS6Yv062455; Sat, 20 Apr 2019 16:28:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201628.x3KGS6Yv062455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 20 Apr 2019 16:28:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346451 - user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto X-SVN-Commit-Revision: 346451 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A1CEF97A54 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:28:07 -0000 Author: ngie Date: Sat Apr 20 16:28:06 2019 New Revision: 346451 URL: https://svnweb.freebsd.org/changeset/base/346451 Log: Fix up `kern.cryptodevallowsoft` handling - Always ensure `kern.cryptodevallowsoft` is unset when completing the tests, otherwise `/dev/crypto` access could remain on after the tests are complete if interrupted. - Check for errors when setting `kern.cryptodevallowsoft`. While this isn't strictly needed in positive cases, it helps when dealing with the myriad of problems that might ensue because `/dev/crypto` doesn't exist when the sysctl isn't enabled. Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:20:57 2019 (r346450) +++ user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:28:06 2019 (r346451) @@ -48,6 +48,10 @@ cleanup_tests() set +e + if [ -n "$oldcdas" ]; then + sysctl "$oldcdas" 2>/dev/null + fi + # Unload modules in reverse order for loaded_module in $(echo $loaded_modules | tr ' ' '\n' | sort -r); do kldunload $loaded_module @@ -66,9 +70,15 @@ for required_module in nexus/aesni cryptodev; do fi done -# Run software crypto test -oldcdas=$(sysctl -e kern.cryptodevallowsoft) -sysctl kern.cryptodevallowsoft=1 +cdas_sysctl=kern.cryptodevallowsoft +if ! oldcdas=$(sysctl -e $cdas_sysctl); then + echo "1..0 # SKIP: could not resolve sysctl: $cdas_sysctl" + exit 0 +fi +if ! sysctl $cdas_sysctl=1; then + echo "1..0 # SKIP: could not enable /dev/crypto access via $cdas_sysctl sysctl." + exit 0 +fi echo "1..1" if "$PYTHON" $(dirname $0)/cryptotest.py; then @@ -76,5 +86,3 @@ if "$PYTHON" $(dirname $0)/cryptotest.py; then else echo "not ok 1" fi - -sysctl "$oldcdas"