diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go index a2c4d4b76..a8a9c045f 100644 --- a/cmd/containerd/main.go +++ b/cmd/containerd/main.go @@ -23,14 +23,11 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd/command" "github.com/containerd/containerd/v2/internal/hasher" - "github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies _ "github.com/containerd/containerd/v2/cmd/containerd/builtins" ) func init() { - //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies - seed.WithTimeAndRand() crypto.RegisterHash(crypto.SHA256, hasher.NewSHA256) } diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go index 350982e0b..6f7665e31 100644 --- a/cmd/ctr/main.go +++ b/cmd/ctr/main.go @@ -23,15 +23,12 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/app" "github.com/containerd/containerd/v2/internal/hasher" - "github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies "github.com/urfave/cli/v2" ) var pluginCmds = []*cli.Command{} func init() { - //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies - seed.WithTimeAndRand() crypto.RegisterHash(crypto.SHA256, hasher.NewSHA256) } diff --git a/pkg/seed/seed.go b/pkg/seed/seed.go deleted file mode 100644 index b8442a88e..000000000 --- a/pkg/seed/seed.go +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -// Package seed provides an initializer for the global [math/rand] seed. -// -// Deprecated: Do not rely on the global seed. -package seed - -import ( - "math/rand" - "time" -) - -// WithTimeAndRand seeds the global math rand generator with nanoseconds -// XOR'ed with a crypto component if available for uniqueness. -// -// Deprecated: Do not rely on the global seed. -func WithTimeAndRand() { - var ( - b [4]byte - u int64 - ) - - tryReadRandom(b[:]) - - // Set higher 32 bits, bottom 32 will be set with nanos - u |= (int64(b[0]) << 56) | (int64(b[1]) << 48) | (int64(b[2]) << 40) | (int64(b[3]) << 32) - - rand.Seed(u ^ time.Now().UnixNano()) -} diff --git a/pkg/seed/seed_linux.go b/pkg/seed/seed_linux.go deleted file mode 100644 index 9f1ef74bb..000000000 --- a/pkg/seed/seed_linux.go +++ /dev/null @@ -1,24 +0,0 @@ -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package seed - -import "golang.org/x/sys/unix" - -func tryReadRandom(p []byte) { - // Ignore errors, just decreases uniqueness of seed - unix.Getrandom(p, unix.GRND_NONBLOCK) -} diff --git a/pkg/seed/seed_other.go b/pkg/seed/seed_other.go deleted file mode 100644 index 03cd46ba9..000000000 --- a/pkg/seed/seed_other.go +++ /dev/null @@ -1,28 +0,0 @@ -//go:build !linux - -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package seed - -import ( - "crypto/rand" - "io" -) - -func tryReadRandom(p []byte) { - io.ReadFull(rand.Reader, p) -}