qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 05:14:40 -07:00
Code Releases Activity

crypto/subtle: unbreak DIT test on openbsd/arm64

Browse Source 
OpenBSD already enables DIT on arm64 in both kernel and userland.
As such, if DIT is already enabled, do not expect that it can be
disabled.

Change-Id: If7aae2ace40d97109beefa71c03e0c138a0995ce
Reviewed-on: https://go-review.googlesource.com/c/go/+/629995
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
Run-TryBot: Joel Sing <joel@sing.id.au>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Joel Sing 2024-11-20 23:50:46 +11:00 committed by Roland Shoemaker
parent 98e719f677
commit b483f382a2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/crypto/subtle/dit_test.go
View File

@ -15,6 +15,8 @@ func TestWithDataIndependentTiming(t *testing.T) {
t.Skip("CPU does not support DIT") t.Skip("CPU does not support DIT")
} }
ditAlreadyEnabled := sys.DITEnabled()
WithDataIndependentTiming(func() { WithDataIndependentTiming(func() {
if !sys.DITEnabled() { if !sys.DITEnabled() {
t.Fatal("dit not enabled within WithDataIndependentTiming closure") t.Fatal("dit not enabled within WithDataIndependentTiming closure")
@ -31,7 +33,7 @@ func TestWithDataIndependentTiming(t *testing.T) {
} }
}) })
if sys.DITEnabled() { if !ditAlreadyEnabled && sys.DITEnabled() {
t.Fatal("dit not unset after returning from WithDataIndependentTiming closure") t.Fatal("dit not unset after returning from WithDataIndependentTiming closure")
} }
} }
@ -41,12 +43,14 @@ func TestDITPanic(t *testing.T) {
t.Skip("CPU does not support DIT") t.Skip("CPU does not support DIT")
} }
ditAlreadyEnabled := sys.DITEnabled()
defer func() { defer func() {
e := recover() e := recover()
if e == nil { if e == nil {
t.Fatal("didn't panic") t.Fatal("didn't panic")
} }
if sys.DITEnabled() { if !ditAlreadyEnabled && sys.DITEnabled() {
t.Error("DIT still enabled after panic inside of WithDataIndependentTiming closure") t.Error("DIT still enabled after panic inside of WithDataIndependentTiming closure")
} }
}() }()