From b08e9013c32221b61bdd76deaa671e908bab2574 Mon Sep 17 00:00:00 2001 From: layou233 Date: Sat, 4 Mar 2023 15:15:49 +0800 Subject: [PATCH] Fix ChaCha20 counter overflow #13 --- go.mod | 4 ++-- go.sum | 8 ++++---- waste/cpu.go | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index b3c555e..ac5c3bd 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/showwin/speedtest-go v1.4.1 - golang.org/x/crypto v0.5.0 + golang.org/x/crypto v0.6.0 ) -require golang.org/x/sys v0.4.0 // indirect +require golang.org/x/sys v0.5.0 // indirect diff --git a/go.sum b/go.sum index 4befe5d..926f5d7 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/showwin/speedtest-go v1.4.1 h1:A+3gmwKIQz9RVlXSilLNadcH6j4wUXF0giIqQeANOdg= github.com/showwin/speedtest-go v1.4.1/go.mod h1:Y7c+pxzaNAlo4mYP+x83pnYY8IM3bkHGDhTdrgUnkNE= -golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/waste/cpu.go b/waste/cpu.go index b3cd772..5c3bd18 100644 --- a/waste/cpu.go +++ b/waste/cpu.go @@ -33,6 +33,13 @@ func CPU(interval time.Duration) { } fmt.Println("[CPU] Successfully wasted on", time.Now()) + + // try to construct a new cipher + newCipher, err := chacha20.NewUnauthenticatedCipher(buffer[:32], buffer[:24]) + if err == nil { + cipher = newCipher + } + time.Sleep(interval) } }