diff options
author | sina <sina@snix.ir> | 2022-07-30 19:16:47 +0430 |
---|---|---|
committer | sina <sina@snix.ir> | 2022-07-30 19:16:47 +0430 |
commit | 6bdd58a59dc2c03b82c63fe89a729bd161192d71 (patch) | |
tree | d0b9a88f567796459df847a1cd608c6f02a366c8 | |
parent | e697fd436cabccb32114ebb74d1de9b9516dead3 (diff) |
subtle package
-rw-r--r-- | go.mod | 6 | ||||
-rw-r--r-- | go.sum | 2 | ||||
-rw-r--r-- | rabbit.go | 4 | ||||
-rw-r--r-- | subtle/overlap.go | 18 | ||||
-rw-r--r-- | subtle/purelap.go | 18 |
5 files changed, 45 insertions, 3 deletions
@@ -1,3 +1,5 @@ -module snix.ir/rabbitio +module rabbitio -go 1.17 +go 1.18 + +require snix.ir/rabbitio v0.0.0-20220730143105-e697fd436cab @@ -0,0 +1,2 @@ +snix.ir/rabbitio v0.0.0-20220730143105-e697fd436cab h1:Bvqk4nRrgrzZ8m+MNUzUzPUeGTbM+I/e4denc2Cmk5U= +snix.ir/rabbitio v0.0.0-20220730143105-e697fd436cab/go.mod h1:fGdJrOtVK0uqEI8x6SBI/NPAAQmtQi/4sjwQPShasEA= @@ -5,6 +5,8 @@ import ( "encoding/binary" "errors" "math/bits" + + "rabbitio/subtle" ) const ( @@ -141,7 +143,7 @@ func (r *rabbitCipher) XORKeyStream(dst, src []byte) { panic("rabbitio: output smaller than input") } - if InexactOverlap(dst, src) { + if subtle.InexactOverlap(dst, src) { panic("rabbitio: invalid buffer memory overlap") } diff --git a/subtle/overlap.go b/subtle/overlap.go new file mode 100644 index 0000000..82ab250 --- /dev/null +++ b/subtle/overlap.go @@ -0,0 +1,18 @@ +//go:build !purego + +package subtle + +import "unsafe" + +func AnyOverlap(x, y []byte) bool { + return len(x) > 0 && len(y) > 0 && + uintptr(unsafe.Pointer(&x[0])) <= uintptr(unsafe.Pointer(&y[len(y)-1])) && + uintptr(unsafe.Pointer(&y[0])) <= uintptr(unsafe.Pointer(&x[len(x)-1])) +} + +func InexactOverlap(x, y []byte) bool { + if len(x) == 0 || len(y) == 0 || &x[0] == &y[0] { + return false + } + return AnyOverlap(x, y) +} diff --git a/subtle/purelap.go b/subtle/purelap.go new file mode 100644 index 0000000..e983129 --- /dev/null +++ b/subtle/purelap.go @@ -0,0 +1,18 @@ +//go:build purego + +package subtle + +import "reflect" + +func AnyOverlap(x, y []byte) bool { + return len(x) > 0 && len(y) > 0 && + reflect.ValueOf(&x[0]).Pointer() <= reflect.ValueOf(&y[len(y)-1]).Pointer() && + reflect.ValueOf(&y[0]).Pointer() <= reflect.ValueOf(&x[len(x)-1]).Pointer() +} + +func InexactOverlap(x, y []byte) bool { + if len(x) == 0 || len(y) == 0 || &x[0] == &y[0] { + return false + } + return AnyOverlap(x, y) +} |