diff options
author | tb <> | 2025-09-04 16:56:42 +0000 |
---|---|---|
committer | tb <> | 2025-09-04 16:56:42 +0000 |
commit | af128331d5ffd3900b2de0226aab397012a3df6f (patch) | |
tree | 6cc22de474105ef8a684fedf8131ad7b460c8b5d /src | |
parent | 51463353d23cd8fd9d57bb4dac5e4e5812daeaa8 (diff) | |
download | openbsd-af128331d5ffd3900b2de0226aab397012a3df6f.tar.gz openbsd-af128331d5ffd3900b2de0226aab397012a3df6f.tar.bz2 openbsd-af128331d5ffd3900b2de0226aab397012a3df6f.zip |
wycheproof: move DSA to v1
key* are now called PublicKey*, so change teh json tags accordingly.
Diffstat (limited to 'src')
-rw-r--r-- | src/regress/lib/libcrypto/wycheproof/wycheproof.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/regress/lib/libcrypto/wycheproof/wycheproof.go b/src/regress/lib/libcrypto/wycheproof/wycheproof.go index 1c3fcd6638..362c341459 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.168 2025/09/04 16:54:17 tb Exp $ */ | 1 | /* $OpenBSD: wycheproof.go,v 1.169 2025/09/04 16:56:42 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> |
@@ -236,9 +236,9 @@ func (wt *wycheproofTestDSA) String() string { | |||
236 | } | 236 | } |
237 | 237 | ||
238 | type wycheproofTestGroupDSA struct { | 238 | type wycheproofTestGroupDSA struct { |
239 | Key *wycheproofDSAKey `json:"key"` | 239 | Key *wycheproofDSAKey `json:"publicKey"` |
240 | KeyDER string `json:"keyDer"` | 240 | KeyDER string `json:"publicKeyDer"` |
241 | KeyPEM string `json:"keyPem"` | 241 | KeyPEM string `json:"publicKeyPem"` |
242 | SHA string `json:"sha"` | 242 | SHA string `json:"sha"` |
243 | Type string `json:"type"` | 243 | Type string `json:"type"` |
244 | Tests []*wycheproofTestDSA `json:"tests"` | 244 | Tests []*wycheproofTestDSA `json:"tests"` |
@@ -2758,8 +2758,8 @@ func main() { | |||
2758 | }{ | 2758 | }{ |
2759 | {v0, "AES", "aes_[cg]*[^xv]_test.json", Normal}, // Skip AES-EAX, AES-GCM-SIV and AES-SIV-CMAC. | 2759 | {v0, "AES", "aes_[cg]*[^xv]_test.json", Normal}, // Skip AES-EAX, AES-GCM-SIV and AES-SIV-CMAC. |
2760 | {v1, "ChaCha20-Poly1305", "chacha20_poly1305_test.json", Normal}, | 2760 | {v1, "ChaCha20-Poly1305", "chacha20_poly1305_test.json", Normal}, |
2761 | {v0, "DSA", "dsa_*test.json", Normal}, | 2761 | {v1, "DSA", "dsa_*test.json", Normal}, |
2762 | {v0, "DSA", "dsa_*_p1363_test.json", P1363}, | 2762 | {v1, "DSA", "dsa_*_p1363_test.json", P1363}, |
2763 | {v0, "ECDH", "ecdh_test.json", Normal}, | 2763 | {v0, "ECDH", "ecdh_test.json", Normal}, |
2764 | {v0, "ECDH", "ecdh_[^w_]*_test.json", Normal}, | 2764 | {v0, "ECDH", "ecdh_[^w_]*_test.json", Normal}, |
2765 | {v0, "ECDH EcPoint", "ecdh_*_ecpoint_test.json", EcPoint}, | 2765 | {v0, "ECDH EcPoint", "ecdh_*_ecpoint_test.json", EcPoint}, |