summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2023-03-25 09:21:17 +0000
committertb <>2023-03-25 09:21:17 +0000
commitab8c5d8bdf12f2d8df1e88ab3c133c69cd718328 (patch)
tree64d33c2715747a6d9356c71cb9476f9e0a740d3a /src
parent906811ced6227c633c80e54fb590c91bbe7774a3 (diff)
downloadopenbsd-ab8c5d8bdf12f2d8df1e88ab3c133c69cd718328.tar.gz
openbsd-ab8c5d8bdf12f2d8df1e88ab3c133c69cd718328.tar.bz2
openbsd-ab8c5d8bdf12f2d8df1e88ab3c133c69cd718328.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/regress/lib/libcrypto/wycheproof/wycheproof.go8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/regress/lib/libcrypto/wycheproof/wycheproof.go b/src/regress/lib/libcrypto/wycheproof/wycheproof.go
index 1213f5ee0e..b3c9225bb6 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.140 2023/03/25 09:17:14 tb Exp $ */ 1/* $OpenBSD: wycheproof.go,v 1.141 2023/03/25 09:21:17 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2018 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2018,2019,2022 Theo Buehler <tb@openbsd.org> 4 * Copyright (c) 2018,2019,2022 Theo Buehler <tb@openbsd.org>
@@ -527,6 +527,7 @@ var nids = map[string]int{
527 "brainpoolP320t1": C.NID_brainpoolP320t1, 527 "brainpoolP320t1": C.NID_brainpoolP320t1,
528 "brainpoolP384t1": C.NID_brainpoolP384t1, 528 "brainpoolP384t1": C.NID_brainpoolP384t1,
529 "brainpoolP512t1": C.NID_brainpoolP512t1, 529 "brainpoolP512t1": C.NID_brainpoolP512t1,
530 "FRP256v1": C.NID_FRP256v1,
530 "secp160k1": C.NID_secp160k1, 531 "secp160k1": C.NID_secp160k1,
531 "secp160r1": C.NID_secp160r1, 532 "secp160r1": C.NID_secp160r1,
532 "secp160r2": C.NID_secp160r2, 533 "secp160r2": C.NID_secp160r2,
@@ -1592,11 +1593,6 @@ func runECDHTest(nid int, variant testVariant, wt *wycheproofTestECDH) bool {
1592} 1593}
1593 1594
1594func runECDHTestGroup(algorithm string, variant testVariant, wtg *wycheproofTestGroupECDH) bool { 1595func runECDHTestGroup(algorithm string, variant testVariant, wtg *wycheproofTestGroupECDH) bool {
1595 if wtg.Curve == "FRP256v1" {
1596 fmt.Printf("INFO: Skipping %v test group %v with curve %v and %v encoding...\n", algorithm, wtg.Type, wtg.Curve, wtg.Encoding)
1597 return true
1598 }
1599
1600 fmt.Printf("Running %v test group %v with curve %v and %v encoding...\n", 1596 fmt.Printf("Running %v test group %v with curve %v and %v encoding...\n",
1601 algorithm, wtg.Type, wtg.Curve, wtg.Encoding) 1597 algorithm, wtg.Type, wtg.Curve, wtg.Encoding)
1602 1598