summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2025-09-04 16:59:37 +0000
committertb <>2025-09-04 16:59:37 +0000
commit5e4abffc8fc301555faf961c1fb0ca017221b01b (patch)
treefaeee9750f40db1ee5b168823f0b5b265860e171
parentaf128331d5ffd3900b2de0226aab397012a3df6f (diff)
downloadopenbsd-5e4abffc8fc301555faf961c1fb0ca017221b01b.tar.gz
openbsd-5e4abffc8fc301555faf961c1fb0ca017221b01b.tar.bz2
openbsd-5e4abffc8fc301555faf961c1fb0ca017221b01b.zip
wycheproof: move EdDSA to v1
eddsa_test.json is now ed25519_test.json and again key* was renamed to PublicKey*.
-rw-r--r--src/regress/lib/libcrypto/wycheproof/wycheproof.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/regress/lib/libcrypto/wycheproof/wycheproof.go b/src/regress/lib/libcrypto/wycheproof/wycheproof.go
index 362c341459..fe60393154 100644
--- a/src/regress/lib/libcrypto/wycheproof/wycheproof.go
+++ b/src/regress/lib/libcrypto/wycheproof/wycheproof.go
@@ -1,4 +1,4 @@
1/* $OpenBSD: wycheproof.go,v 1.169 2025/09/04 16:56:42 tb Exp $ */ 1/* $OpenBSD: wycheproof.go,v 1.170 2025/09/04 16:59:37 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2018,2023 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018,2023 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2018,2019,2022-2024 Theo Buehler <tb@openbsd.org> 4 * Copyright (c) 2018,2019,2022-2024 Theo Buehler <tb@openbsd.org>
@@ -357,10 +357,10 @@ func (wt *wycheproofTestEdDSA) String() string {
357} 357}
358 358
359type wycheproofTestGroupEdDSA struct { 359type wycheproofTestGroupEdDSA struct {
360 JWK *wycheproofJWKEdDSA `json:"jwk"` 360 JWK *wycheproofJWKEdDSA `json:"publicKeyJwk"`
361 Key *wycheproofEdDSAKey `json:"key"` 361 Key *wycheproofEdDSAKey `json:"publicKey"`
362 KeyDer string `json:"keyDer"` 362 KeyDer string `json:"publicKeyDer"`
363 KeyPem string `json:"keyPem"` 363 KeyPem string `json:"publicKeyPem"`
364 Type string `json:"type"` 364 Type string `json:"type"`
365 Tests []*wycheproofTestEdDSA `json:"tests"` 365 Tests []*wycheproofTestEdDSA `json:"tests"`
366} 366}
@@ -2768,8 +2768,8 @@ func main() {
2768 {v0, "ECDSA", "ecdsa_[^w]*test.json", Normal}, 2768 {v0, "ECDSA", "ecdsa_[^w]*test.json", Normal},
2769 {v0, "ECDSA P1363", "ecdsa_*_p1363_test.json", P1363}, 2769 {v0, "ECDSA P1363", "ecdsa_*_p1363_test.json", P1363},
2770 {v0, "ECDSA webcrypto", "ecdsa_webcrypto_test.json", Webcrypto}, 2770 {v0, "ECDSA webcrypto", "ecdsa_webcrypto_test.json", Webcrypto},
2771 {v0, "EDDSA", "eddsa_test.json", Normal}, 2771 {v1, "EDDSA", "ed25519_test.json", Normal},
2772 {v0, "ED448", "ed448_test.json", Skip}, 2772 {v1, "ED448", "ed448_test.json", Skip},
2773 {v0, "HKDF", "hkdf_sha*_test.json", Normal}, 2773 {v0, "HKDF", "hkdf_sha*_test.json", Normal},
2774 {v1, "HMAC", "hmac_sha*_test.json", Normal}, 2774 {v1, "HMAC", "hmac_sha*_test.json", Normal},
2775 {v0, "JSON webcrypto", "json_web_*_test.json", Skip}, 2775 {v0, "JSON webcrypto", "json_web_*_test.json", Skip},