From nobody Mon Sep 4 14:11:45 2023
X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfVtp0nNtz4rkkH;
Mon, 4 Sep 2023 14:11:46 +0000 (UTC)
(envelope-from git@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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4RfVtp04q0z4br5;
Mon, 4 Sep 2023 14:11:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1693836706;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=d7KOlR/NEb0zn38ljf2wGZ20PXea0WR5gFh+JOLPiyA=;
b=c9daCq4bSnsZlXZLKY4l+1W7BsPdWcOkpyDXVUL83eNKaD9nAVYeEpWvzDVvKxfQqP06HI
IydxojGNjwEYEtfk8e98jmvDxAaX9ivyGx21DY1TPaG6vvcRgS5tzUPKZYlnbJ1wgqceZE
trTNMmBVVRf0sUDd364mpF1ixDDVdwV2nmx5kzQjnomQ48d9ZD7p72WFJ38xdVgaWFKHO2
KLo7GqoRG1l0Hdxnw3xik7aPREM/yONxvQri1J/OYPMF19BOlQ55xOoImENpQOqCLqSxic
RwNU+twgIv7Mzkx/Oup8SMPHV9RgEJgofQEzMxGCyI6WI3W+kwmKUHiwercxFw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693836706; a=rsa-sha256; cv=none;
b=D2ZqC6Vc4wjVfJXcmCsUa19qaDmmK63pw6tj+AzLrQzgdWahnyCtcTNfR6edKQelfqDQZ6
YOqe4diOhevujX7DDp+1aHusVWbXQKcCeK71p/9UUPiUuY2gsGbUaZusjwMqjUPXnwb3Zp
EjT+3OqLkWA6nIOQD2AYNttyDeemRrixBweOSy9DR0k0uN31IkmbiKCY39ScL0u+ZEE6Y7
6l5vDng8aKivKvwqyp/f4ul1rt8AYd5izliBH1zD6AkLAWpdewvNX4e8ycrJWrsY1S0rf2
4jwmIZhcl92dwH6z3NfmW1LwXG4k/2x1xb/pAo32eY1YP7ZNq3D5pTwtpEKHWA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1693836706;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=d7KOlR/NEb0zn38ljf2wGZ20PXea0WR5gFh+JOLPiyA=;
b=ViZcBRZMWy5ZG9oDhvkBLK8gc2+l2EILpr9Nml9A2y9PhLV0/bxTKwwUVmnzyEM/JeXpA+
oHP0p/bUQo0j4g4WC0WEHaTlO8JS7Guqr5a2E6ta6S9FG6U2PdJ4mvGOmwGg+Uko5+H4zc
HcIGYckYfTDpUdEDLxatskSA/685PI/HQfZ3b/ZjPvIwZUafe2Lmpsu00TEgHF6s9Ijsij
GsiUaq2TBXi3H4koGRXOkV25KikT4+3Iu3PKrOS+gBd1pzYkBizwu0N7KBB8kaW023Oins
/hWfctQWBZ042JYCOGShHxjRbDY1mJkSrdIwDJbCNvk3AbvyeByHCTE2ty0Tfg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RfVtn6J6gz18ft;
Mon, 4 Sep 2023 14:11:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384EBjGf062925;
Mon, 4 Sep 2023 14:11:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384EBj2v062922;
Mon, 4 Sep 2023 14:11:45 GMT
(envelope-from git)
Date: Mon, 4 Sep 2023 14:11:45 GMT
Message-Id: <202309041411.384EBj2v062922@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 34e146632e62 - stable/14 - geli tests: Add a regression
test for geli setkey -J
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 34e146632e623b5f208b745a99e2fdbed22bd942
Auto-Submitted: auto-generated
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=34e146632e623b5f208b745a99e2fdbed22bd942
commit 34e146632e623b5f208b745a99e2fdbed22bd942
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-08-28 14:58:43 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-09-04 14:11:04 +0000
geli tests: Add a regression test for geli setkey -J
Make sure that it can be used to change the passphrase of both attached
and detached providers.
Approved by: re (kib)
PR: 254966
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 2b7b09ac9675023869fddbae4911c9b674b1155a)
---
tests/sys/geom/class/eli/setkey_test.sh | 59 +++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/tests/sys/geom/class/eli/setkey_test.sh b/tests/sys/geom/class/eli/setkey_test.sh
index c981b6fc266b..ce3833f5fe0c 100644
--- a/tests/sys/geom/class/eli/setkey_test.sh
+++ b/tests/sys/geom/class/eli/setkey_test.sh
@@ -92,6 +92,64 @@ setkey_cleanup()
geli_test_cleanup
}
+atf_test_case setkey_passphrase cleanup
+setkey_passphrase_head()
+{
+ atf_set "descr" "geli setkey can change the passphrase for a provider"
+ atf_set "require.user" "root"
+}
+setkey_passphrase_body()
+{
+ geli_test_setup
+
+ sectors=100
+ md=$(attach_md -t malloc -s `expr $sectors + 1`)
+
+ atf_check dd if=/dev/random of=rnd bs=512 count=${sectors} status=none
+ hash1=`dd if=rnd bs=512 count=${sectors} status=none | md5`
+ atf_check_equal 0 $?
+ atf_check dd if=/dev/random of=pass1 bs=512 count=32 status=none
+ atf_check dd if=/dev/random of=pass2 bs=512 count=32 status=none
+ atf_check dd if=/dev/random of=pass3 bs=512 count=32 status=none
+
+ atf_check geli init -B none -J pass1 ${md}
+ atf_check geli attach -j pass1 ${md}
+
+ atf_check \
+ dd if=rnd of=/dev/${md}.eli bs=512 count=${sectors} status=none
+ hash2=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5`
+ atf_check_equal 0 $?
+
+ atf_check geli detach ${md}
+
+ # Change from passphrase 1 to passphrase 2 for the detached provider.
+ atf_check -s exit:0 -o ignore geli setkey -j pass1 -J pass2 ${md}
+
+ # Make sure that we can attach with passphrase 2 but not with
+ # passphrase 1.
+ atf_check -s not-exit:0 -e match:"Wrong key" \
+ geli attach -j pass1 ${md}
+ atf_check -s exit:0 geli attach -j pass2 ${md}
+ hash3=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5`
+
+ # Change from passphrase 2 to passphrase 3 for the attached provider.
+ atf_check -s exit:0 -o ignore geli setkey -j pass2 -J pass3 ${md}
+ hash4=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5`
+ atf_check geli detach ${md}
+
+ # Make sure that we cannot attach with passphrase 2 anymore.
+ atf_check -s not-exit:0 -e match:"Wrong key" \
+ geli attach -j pass2 ${md}
+
+ atf_check_equal ${hash1} ${hash2}
+ atf_check_equal ${hash1} ${hash3}
+ atf_check_equal ${hash1} ${hash4}
+}
+setkey_passphrase_cleanup()
+{
+ geli_test_cleanup
+}
+
atf_test_case setkey_readonly cleanup
setkey_readonly_head()
{
@@ -157,6 +215,7 @@ nokey_cleanup()
atf_init_test_cases()
{
atf_add_test_case setkey
+ atf_add_test_case setkey_passphrase
atf_add_test_case setkey_readonly
atf_add_test_case nokey
}