From owner-svn-src-all@freebsd.org Wed Nov 4 22:41:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CA39468667; Wed, 4 Nov 2020 22:41:55 +0000 (UTC) (envelope-from jkim@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4CRM8g3W0Mz4P0H; Wed, 4 Nov 2020 22:41:55 +0000 (UTC) (envelope-from jkim@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 44D3A14DB7; Wed, 4 Nov 2020 22:41:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A4MftXe031637; Wed, 4 Nov 2020 22:41:55 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A4MfsVH031635; Wed, 4 Nov 2020 22:41:54 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <202011042241.0A4MfsVH031635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 4 Nov 2020 22:41:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367351 - head/tests/sys/opencrypto X-SVN-Group: head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head/tests/sys/opencrypto X-SVN-Commit-Revision: 367351 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Nov 2020 22:41:55 -0000 Author: jkim Date: Wed Nov 4 22:41:54 2020 New Revision: 367351 URL: https://svnweb.freebsd.org/changeset/base/367351 Log: Make the tests work without COMPAT_FREEBSD12 in kernel. sysctl 'kern.cryptodevallowsoft' was renamed to 'kern.crypto.allow_soft' in r359374 and the prevous one is only available in kernel built with "options COMPAT_FREEBSD12". Modified: head/tests/sys/opencrypto/blake2_test.c head/tests/sys/opencrypto/poly1305_test.c head/tests/sys/opencrypto/runtests.sh Modified: head/tests/sys/opencrypto/blake2_test.c ============================================================================== --- head/tests/sys/opencrypto/blake2_test.c Wed Nov 4 22:29:01 2020 (r367350) +++ head/tests/sys/opencrypto/blake2_test.c Wed Nov 4 22:41:54 2020 (r367351) @@ -185,14 +185,14 @@ test_blake2s_vectors(const char *devname, const char * ATF_TC_WITHOUT_HEAD(blake2b_vectors); ATF_TC_BODY(blake2b_vectors, tc) { - ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); + ATF_REQUIRE_SYSCTL_INT("kern.crypto.allow_soft", 1); test_blake2b_vectors("cryptosoft0", "nexus/cryptosoft"); } ATF_TC_WITHOUT_HEAD(blake2s_vectors); ATF_TC_BODY(blake2s_vectors, tc) { - ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); + ATF_REQUIRE_SYSCTL_INT("kern.crypto.allow_soft", 1); test_blake2s_vectors("cryptosoft0", "nexus/cryptosoft"); } @@ -200,14 +200,14 @@ ATF_TC_BODY(blake2s_vectors, tc) ATF_TC_WITHOUT_HEAD(blake2b_vectors_x86); ATF_TC_BODY(blake2b_vectors_x86, tc) { - ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); + ATF_REQUIRE_SYSCTL_INT("kern.crypto.allow_soft", 1); test_blake2b_vectors("blaketwo0", "nexus/blake2"); } ATF_TC_WITHOUT_HEAD(blake2s_vectors_x86); ATF_TC_BODY(blake2s_vectors_x86, tc) { - ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); + ATF_REQUIRE_SYSCTL_INT("kern.crypto.allow_soft", 1); test_blake2s_vectors("blaketwo0", "nexus/blake2"); } #endif Modified: head/tests/sys/opencrypto/poly1305_test.c ============================================================================== --- head/tests/sys/opencrypto/poly1305_test.c Wed Nov 4 22:29:01 2020 (r367350) +++ head/tests/sys/opencrypto/poly1305_test.c Wed Nov 4 22:41:54 2020 (r367351) @@ -390,7 +390,7 @@ test_rfc7539_poly1305_vectors(int crid, const char *mo ATF_TC_WITHOUT_HEAD(poly1305_vectors); ATF_TC_BODY(poly1305_vectors, tc) { - ATF_REQUIRE_SYSCTL_INT("kern.cryptodevallowsoft", 1); + ATF_REQUIRE_SYSCTL_INT("kern.crypto.allow_soft", 1); test_rfc7539_poly1305_vectors(CRYPTO_FLAG_SOFTWARE, "nexus/cryptosoft"); } Modified: head/tests/sys/opencrypto/runtests.sh ============================================================================== --- head/tests/sys/opencrypto/runtests.sh Wed Nov 4 22:29:01 2020 (r367350) +++ head/tests/sys/opencrypto/runtests.sh Wed Nov 4 22:41:54 2020 (r367351) @@ -83,7 +83,7 @@ for required_module in $cpu_module cryptodev; do fi done -cdas_sysctl=kern.cryptodevallowsoft +cdas_sysctl=kern.crypto.allow_soft if ! oldcdas=$(sysctl -e $cdas_sysctl); then echo "1..0 # SKIP: could not resolve sysctl: $cdas_sysctl" exit 0