From: Theo Buehler <tb@theobuehler.org>
Subject: move security/wycheproof-testvectors to security/wycheproof
To: ports@openbsd.org
Date: Thu, 22 Jan 2026 00:05:50 +0100

When we added wycheproof-testvectors the name reflected that it was a
small subdirectory of a giant Java testing contraption. There's a long
story whose short version is that Wycheproof has been maintained as
part of the C2SP for a while now, Java was replaced with some minimal
Go and the focus is on test cases, not a full testing framework.

Given this, I'd like to rename and slightly simplify the port with
the next update and only skip the .github directory in the generated
tarball. The diff between Makefiles and PLISTs is below for ease of
review, full tarball attached.

--- security/wycheproof-testvectors/Makefile
+++ security/wycheproof/Makefile
@@ -1,12 +1,12 @@
 COMMENT =	test vectors from Project Wycheproof
 
 # No releases
-VERSION =	20251219
-DISTNAME =	wycheproof-testvectors-${VERSION}
+VERSION =	20260119
+DISTNAME =	wycheproof-${VERSION}
 
 GH_ACCOUNT =	C2SP
 GH_PROJECT =	wycheproof
-GH_COMMIT =	7c661e3a5379b65645e4f8dab44d0ba88b20906e
+GH_COMMIT =	0fd0ec1cf2114f456f5c3e7c61ba807fb1311b45
 
 CATEGORIES =	security devel
 
@@ -18,13 +18,10 @@ PERMIT_PACKAGE =	Yes
 NO_BUILD =		Yes
 NO_TEST =		Yes
 
-WYCHEPROOF_DIR =	${PREFIX}/share/wycheproof/testvectors_v1
-WYCHEPROOF_SCHEMAS =	${PREFIX}/share/wycheproof/schemas
+WYCHEPROOF_DIR =	${PREFIX}/share/wycheproof/
 
 do-install:
 	${INSTALL_DATA_DIR} ${WYCHEPROOF_DIR}
-	${INSTALL_DATA_DIR} ${WYCHEPROOF_SCHEMAS}
-	${INSTALL_DATA} ${WRKSRC}/testvectors_v1/*.json ${WYCHEPROOF_DIR}
-	${INSTALL_DATA} ${WRKSRC}/schemas/*.json ${WYCHEPROOF_SCHEMAS}
+	cd ${WRKSRC} && pax -rw -s ',^.*/\.github.*,,' . ${WYCHEPROOF_DIR}
 
 .include <bsd.port.mk>
--- security/wycheproof-testvectors/pkg/PLIST
+++ security/wycheproof/pkg/PLIST
@@ -1,4 +1,32 @@
+@pkgpath security/wycheproof-testvectors
+@conflict wycheproof-testvectors-*
 share/wycheproof/
+share/wycheproof/CONTRIBUTING.md
+share/wycheproof/LICENSE
+share/wycheproof/README.md
+share/wycheproof/composer.json
+share/wycheproof/doc/
+share/wycheproof/doc/W.svg
+share/wycheproof/doc/aegis.md
+share/wycheproof/doc/aesgcm.md
+share/wycheproof/doc/bib.md
+share/wycheproof/doc/bugs.md
+share/wycheproof/doc/dh.md
+share/wycheproof/doc/dsa.md
+share/wycheproof/doc/ecdh.md
+share/wycheproof/doc/ecdsa.md
+share/wycheproof/doc/ff1.md
+share/wycheproof/doc/files.md
+share/wycheproof/doc/formats.md
+share/wycheproof/doc/hkdf.md
+share/wycheproof/doc/index.md
+share/wycheproof/doc/json_web_crypto.md
+share/wycheproof/doc/key_wrap.md
+share/wycheproof/doc/rsa.md
+share/wycheproof/doc/spongycastle.md
+share/wycheproof/doc/types.md
+share/wycheproof/go.mod
+share/wycheproof/go.sum
 share/wycheproof/schemas/
 share/wycheproof/schemas/aead_test_schema_v1.json
 share/wycheproof/schemas/common.json
@@ -31,6 +59,7 @@ share/wycheproof/schemas/mldsa_sign_noseed_schema.json
 share/wycheproof/schemas/mldsa_sign_seed_schema.json
 share/wycheproof/schemas/mldsa_verify_schema.json
 share/wycheproof/schemas/mlkem_encaps_test_schema.json
+share/wycheproof/schemas/mlkem_keygen_seed_test_schema.json
 share/wycheproof/schemas/mlkem_semi_expanded_decaps_test_schema.json
 share/wycheproof/schemas/mlkem_test_schema.json
 share/wycheproof/schemas/primality_test_schema_v1.json
@@ -44,6 +73,7 @@ share/wycheproof/schemas/xdh_asn_comp_schema_v1.json
 share/wycheproof/schemas/xdh_comp_schema_v1.json
 share/wycheproof/schemas/xdh_jwk_comp_schema_v1.json
 share/wycheproof/schemas/xdh_pem_comp_schema_v1.json
+share/wycheproof/testvectors.go
 share/wycheproof/testvectors_v1/
 share/wycheproof/testvectors_v1/a128cbc_hs256_test.json
 share/wycheproof/testvectors_v1/a192cbc_hs384_test.json
@@ -243,12 +273,15 @@ share/wycheproof/testvectors_v1/mldsa_87_sign_noseed_test.json
 share/wycheproof/testvectors_v1/mldsa_87_sign_seed_test.json
 share/wycheproof/testvectors_v1/mldsa_87_verify_test.json
 share/wycheproof/testvectors_v1/mlkem_1024_encaps_test.json
+share/wycheproof/testvectors_v1/mlkem_1024_keygen_seed_test.json
 share/wycheproof/testvectors_v1/mlkem_1024_semi_expanded_decaps_test.json
 share/wycheproof/testvectors_v1/mlkem_1024_test.json
 share/wycheproof/testvectors_v1/mlkem_512_encaps_test.json
+share/wycheproof/testvectors_v1/mlkem_512_keygen_seed_test.json
 share/wycheproof/testvectors_v1/mlkem_512_semi_expanded_decaps_test.json
 share/wycheproof/testvectors_v1/mlkem_512_test.json
 share/wycheproof/testvectors_v1/mlkem_768_encaps_test.json
+share/wycheproof/testvectors_v1/mlkem_768_keygen_seed_test.json
 share/wycheproof/testvectors_v1/mlkem_768_semi_expanded_decaps_test.json
 share/wycheproof/testvectors_v1/mlkem_768_test.json
 share/wycheproof/testvectors_v1/morus1280_test.json
@@ -378,3 +411,9 @@ share/wycheproof/testvectors_v1/x448_jwk_test.json
 share/wycheproof/testvectors_v1/x448_pem_test.json
 share/wycheproof/testvectors_v1/x448_test.json
 share/wycheproof/testvectors_v1/xchacha20_poly1305_test.json
+share/wycheproof/tools/
+share/wycheproof/tools/reformat_json.py
+share/wycheproof/tools/twistcheck/
+share/wycheproof/tools/twistcheck/twistcheck.go
+share/wycheproof/tools/vectorlint/
+share/wycheproof/tools/vectorlint/main.go