diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/regress/lib/libcrypto/wycheproof/wycheproof.go | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/regress/lib/libcrypto/wycheproof/wycheproof.go b/src/regress/lib/libcrypto/wycheproof/wycheproof.go index ae24533684..4b0a4c587c 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.187 2025/09/08 07:10:14 tb Exp $ */ | 1 | /* $OpenBSD: wycheproof.go,v 1.188 2025/09/08 08:00:47 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-2025 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2018,2019,2022-2025 Theo Buehler <tb@openbsd.org> |
@@ -2090,11 +2090,11 @@ func runEdDSATest(pkey *C.EVP_PKEY, wt *wycheproofTestEdDSA) bool { | |||
2090 | } | 2090 | } |
2091 | 2091 | ||
2092 | func (wtg *wycheproofTestGroupEdDSA) run(algorithm string, variant testVariant) bool { | 2092 | func (wtg *wycheproofTestGroupEdDSA) run(algorithm string, variant testVariant) bool { |
2093 | fmt.Printf("Running %v test group %v...\n", algorithm, wtg.Type) | 2093 | if wtg.Key.Curve == "edwards25519" { |
2094 | 2094 | fmt.Printf("Running %v test group %v...\n", algorithm, wtg.Type) | |
2095 | if wtg.Key.Curve != "edwards25519" || wtg.Key.KeySize != 255 { | 2095 | } else { |
2096 | fmt.Printf("INFO: Unexpected curve or key size. want (\"edwards25519\", 255), got (%q, %d)\n", wtg.Key.Curve, wtg.Key.KeySize) | 2096 | fmt.Printf("INFO: Skipping %v test group %v for %v...\n", algorithm, wtg.Type, wtg.Key.Curve) |
2097 | return false | 2097 | return true |
2098 | } | 2098 | } |
2099 | 2099 | ||
2100 | pubKey, pubKeyLen := mustDecodeHexString(wtg.Key.Pk, "pubkey") | 2100 | pubKey, pubKeyLen := mustDecodeHexString(wtg.Key.Pk, "pubkey") |
@@ -2732,7 +2732,12 @@ func runX25519Test(wt *wycheproofTestX25519) bool { | |||
2732 | } | 2732 | } |
2733 | 2733 | ||
2734 | func (wtg *wycheproofTestGroupX25519) run(algorithm string, variant testVariant) bool { | 2734 | func (wtg *wycheproofTestGroupX25519) run(algorithm string, variant testVariant) bool { |
2735 | fmt.Printf("Running %v test group with curve %v...\n", algorithm, wtg.Curve) | 2735 | if wtg.Curve == "curve25519" { |
2736 | fmt.Printf("Running %v test group with curve %v...\n", algorithm, wtg.Curve) | ||
2737 | } else { | ||
2738 | fmt.Printf("INFO: Skipping %v test group with curve %v...\n", algorithm, wtg.Curve) | ||
2739 | return true | ||
2740 | } | ||
2736 | 2741 | ||
2737 | success := true | 2742 | success := true |
2738 | for _, wt := range wtg.Tests { | 2743 | for _, wt := range wtg.Tests { |