InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51139 from smerkviladze/bump-swarmkit-to-v2.1.1

Browse Source 
vendor: github.com/moby/swarmkit/v2 v2.1.1
This commit is contained in:
Sebastiaan van Stijn
2025-10-08 23:16:27 +02:00
committed by GitHub
parent a04b1aee35 ca9c5c6f7b
commit e8c4b6ec32
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -66,7 +66,7 @@ require (
github.com/moby/profiles/apparmor v0.1.0
github.com/moby/profiles/seccomp v0.1.0
github.com/moby/pubsub v1.0.0
github.com/moby/swarmkit/v2 v2.1.0
github.com/moby/swarmkit/v2 v2.1.1
github.com/moby/sys/atomicwriter v0.1.0
github.com/moby/sys/mount v0.3.4
github.com/moby/sys/mountinfo v0.7.2

4
go.sum
View File

@@ -410,8 +410,8 @@ github.com/moby/profiles/seccomp v0.1.0 h1:kVf1lc5ytNB1XPxEdZUVF+oPpbBYJHR50eEvP
github.com/moby/profiles/seccomp v0.1.0/go.mod h1:Kqk57vxH6/wuOc5bmqRiSXJ6iEz8Pvo3LQRkv0ytFWs=
github.com/moby/pubsub v1.0.0 h1:jkp/imWsmJz2f6LyFsk7EkVeN2HxR/HTTOY8kHrsxfA=
github.com/moby/pubsub v1.0.0/go.mod h1:bXSO+3h5MNXXCaEG+6/NlAIk7MMZbySZlnB+cUQhKKc=
github.com/moby/swarmkit/v2 v2.1.0 h1:u+cJ5hSyF3HnzsyI+NtegYxdIPQIuibk7IbpXNxuISM=
github.com/moby/swarmkit/v2 v2.1.0/go.mod h1:mTTGIAz/59OGZR5Qe+QByIe3Nxc+sSuJkrsStFhr6Lg=
github.com/moby/swarmkit/v2 v2.1.1 h1:yvTJ8MMCc3f0qTA44J6R59EZ5yZawdYopkpuLk4+ICU=
github.com/moby/swarmkit/v2 v2.1.1/go.mod h1:mTTGIAz/59OGZR5Qe+QByIe3Nxc+sSuJkrsStFhr6Lg=
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk=

14
vendor/github.com/moby/swarmkit/v2/ca/config.go generated vendored
View File

@@ -9,6 +9,7 @@ import (
"math/big"
"math/rand"
"path/filepath"
"slices"
"strings"
"sync"
"time"
@@ -60,6 +61,17 @@ var (
errInvalidJoinToken = errors.New("invalid join token")
)
// strongTLSCiphers defines a secure, modern set of TLS cipher suites
// with known weak algorithms removed.
var strongTLSCiphers = []uint16{
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
}
// SecurityConfig is used to represent a node's security configuration. It includes information about
// the RootCA and ServerTLSCreds/ClientTLSCreds transport authenticators to be used for MTLS
type SecurityConfig struct {
@@ -649,6 +661,7 @@ func NewServerTLSConfig(certs []tls.Certificate, rootCAPool *x509.CertPool) (*tl
RootCAs: rootCAPool,
ClientCAs: rootCAPool,
PreferServerCipherSuites: true,
CipherSuites: slices.Clone(strongTLSCiphers),
MinVersion: tls.VersionTLS12,
NextProtos: alpnProtoStr,
}, nil
@@ -665,6 +678,7 @@ func NewClientTLSConfig(certs []tls.Certificate, rootCAPool *x509.CertPool, serv
ServerName: serverName,
Certificates: certs,
RootCAs: rootCAPool,
CipherSuites: slices.Clone(strongTLSCiphers),
MinVersion: tls.VersionTLS12,
}, nil
}

2
vendor/modules.txt vendored
View File

@@ -983,7 +983,7 @@ github.com/moby/profiles/seccomp
# github.com/moby/pubsub v1.0.0
## explicit; go 1.19
github.com/moby/pubsub
# github.com/moby/swarmkit/v2 v2.1.0
# github.com/moby/swarmkit/v2 v2.1.1
## explicit; go 1.18
github.com/moby/swarmkit/v2/agent
github.com/moby/swarmkit/v2/agent/configs