From e95916caa049276ca034ec42e219dcf769815855 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 25 Mar 2023 09:21:17 +0000 Subject: [PATCH] Enable FRP256v2 tests This was previously disabled because tb apparently can't grep. Exercise this curve as well as part of the new test cases in ECDH wycheproof. --- regress/lib/libcrypto/wycheproof/wycheproof.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/regress/lib/libcrypto/wycheproof/wycheproof.go b/regress/lib/libcrypto/wycheproof/wycheproof.go index 1213f5ee0e0..b3c9225bb61 100644 --- a/regress/lib/libcrypto/wycheproof/wycheproof.go +++ b/regress/lib/libcrypto/wycheproof/wycheproof.go @@ -1,4 +1,4 @@ -/* $OpenBSD: wycheproof.go,v 1.140 2023/03/25 09:17:14 tb Exp $ */ +/* $OpenBSD: wycheproof.go,v 1.141 2023/03/25 09:21:17 tb Exp $ */ /* * Copyright (c) 2018 Joel Sing * Copyright (c) 2018,2019,2022 Theo Buehler @@ -527,6 +527,7 @@ var nids = map[string]int{ "brainpoolP320t1": C.NID_brainpoolP320t1, "brainpoolP384t1": C.NID_brainpoolP384t1, "brainpoolP512t1": C.NID_brainpoolP512t1, + "FRP256v1": C.NID_FRP256v1, "secp160k1": C.NID_secp160k1, "secp160r1": C.NID_secp160r1, "secp160r2": C.NID_secp160r2, @@ -1592,11 +1593,6 @@ func runECDHTest(nid int, variant testVariant, wt *wycheproofTestECDH) bool { } func runECDHTestGroup(algorithm string, variant testVariant, wtg *wycheproofTestGroupECDH) bool { - if wtg.Curve == "FRP256v1" { - fmt.Printf("INFO: Skipping %v test group %v with curve %v and %v encoding...\n", algorithm, wtg.Type, wtg.Curve, wtg.Encoding) - return true - } - fmt.Printf("Running %v test group %v with curve %v and %v encoding...\n", algorithm, wtg.Type, wtg.Curve, wtg.Encoding) -- 2.20.1