chore: update crypto to use new import path siderolabs/crypto

No functional changes in this PR, just updating import paths.

Signed-off-by: Andrey Smirnov <[email protected]>

cmd/talosctl/cmd/mgmt/gen/ca.go

@@ -9,8 +9,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/spf13/cobra"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/cli"
 )

cmd/talosctl/cmd/mgmt/gen/crt.go

@@ -11,8 +11,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/spf13/cobra"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/cli"
 )

cmd/talosctl/cmd/mgmt/gen/csr.go

@@ -13,8 +13,8 @@ import (
 	"path"
 	"strings"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/spf13/cobra"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/cli"
 	"github.com/talos-systems/talos/pkg/machinery/role"

cmd/talosctl/cmd/mgmt/gen/key.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/spf13/cobra"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/cli"
 )

cmd/talosctl/cmd/mgmt/gen/keypair.go

@@ -9,8 +9,8 @@ import (
 	"net"
 	"os"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/spf13/cobra"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/cli"
 )

cmd/talosctl/pkg/talos/global/client.go

@@ -9,7 +9,7 @@ import (
 	"crypto/tls"
 	"fmt"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	"google.golang.org/grpc"
 
 	"github.com/talos-systems/talos/pkg/cli"

go.mod

@@ -87,13 +87,13 @@ require (
 	github.com/ryanuber/go-glob v1.0.0
 	github.com/safchain/ethtool v0.2.0
 	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9
+	github.com/siderolabs/crypto v0.4.0
 	github.com/siderolabs/discovery-client v0.1.1
 	github.com/siderolabs/go-pcidb v0.1.0
 	github.com/siderolabs/go-pointer v1.0.0
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.0
-	github.com/talos-systems/crypto v0.3.6
 	github.com/talos-systems/discovery-api v0.1.0
 	github.com/talos-systems/go-blockdevice v0.3.4
 	github.com/talos-systems/go-cmd v0.1.0

go.sum

@@ -1051,6 +1051,8 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sethgrid/pester v0.0.0-20190127155807-68a33a018ad0 h1:X9XMOYjxEfAYSy3xK1DzO5dMkkWhs9E9UCcS1IERx2k=
 github.com/sethgrid/pester v0.0.0-20190127155807-68a33a018ad0/go.mod h1:Ad7IjTpvzZO8Fl0vh9AzQ+j/jYZfyp2diGwI8m5q+ns=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/siderolabs/crypto v0.4.0 h1:o1KIR1KyevUcY9nbJlSyQAj7+p+rveGGF8LjAAFMtjc=
+github.com/siderolabs/crypto v0.4.0/go.mod h1:itZpBsJ9i0aH8jiHAuSlKCal7hni7X1aDYo6vGVl5LY=
 github.com/siderolabs/discovery-client v0.1.1 h1:1lhXTepW4V1IJPf91ApvF77cBl086d1OXuC4WdVp8hM=
 github.com/siderolabs/discovery-client v0.1.1/go.mod h1:gBE5qxdB4BcY2nXOBJ14Qh8u7cBadCofjbxBLohcnbQ=
 github.com/siderolabs/go-pcidb v0.1.0 h1:6cJPBBmHlIF4GouYR/1g3JXS/niAON+6lIOfKl/t794=
@@ -1126,8 +1128,6 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-github.com/talos-systems/crypto v0.3.6 h1:aq1uADaF71P2/K35igWx8u/ivHOYp3vHQ/kAzqu83vk=
-github.com/talos-systems/crypto v0.3.6/go.mod h1:jbt9CspHnhdwyKmXQQEIiFSHz1cfsCJjsd0iNat1wEA=
 github.com/talos-systems/discovery-api v0.1.0 h1:aKod6uqakH6VfeQ6HaxPF7obqFAL1QTJe4HHTb2mVKk=
 github.com/talos-systems/discovery-api v0.1.0/go.mod h1:ZsbzzOC5bzToaF3+YvUXDf9paeWV5bedpDu5RPXrglM=
 github.com/talos-systems/go-blockdevice v0.3.4 h1:LP2hgIcd5qbympxYFlWbHYTPyD/f/sZjBMma01soniQ=

hack/structprotogen/proto/proto.go

@@ -373,9 +373,9 @@ func formatTypeName(fieldTypePkg string, fieldType string, declPkg string) (stri
 		return commoProto, "common.NetIP"
 	case typeData{"github.com/opencontainers/runtime-spec/specs-go", "Mount"}:
 		return "resource/definitions/proto/proto.proto", "talos.resource.definitions.proto.Mount"
-	case typeData{"github.com/talos-systems/crypto/x509", "PEMEncodedCertificateAndKey"}:
+	case typeData{"github.com/siderolabs/crypto/x509", "PEMEncodedCertificateAndKey"}:
 		return commoProto, "common.PEMEncodedCertificateAndKey"
-	case typeData{"github.com/talos-systems/crypto/x509", "PEMEncodedKey"}:
+	case typeData{"github.com/siderolabs/crypto/x509", "PEMEncodedKey"}:
 		return commoProto, "common.PEMEncodedKey"
 	default:
 		return "", ""

internal/app/apid/pkg/provider/provider.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
-	"github.com/talos-systems/crypto/tls"
+	"github.com/siderolabs/crypto/tls"
 
 	"github.com/talos-systems/talos/pkg/machinery/resources/secrets"
 )

internal/app/machined/pkg/controllers/etcd/pki.go

@@ -13,8 +13,8 @@ import (
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/safe"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 	"go.uber.org/zap"
 
 	"github.com/talos-systems/talos/pkg/filetree"

internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go

@@ -15,8 +15,8 @@ import (
 	"github.com/cosi-project/runtime/pkg/controller"
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 	"go.uber.org/zap"
 
 	"github.com/talos-systems/talos/pkg/machinery/constants"

internal/app/machined/pkg/controllers/kubeaccess/serviceaccount.go

@@ -13,8 +13,8 @@ import (
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/safe"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 	"go.uber.org/zap"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"

internal/app/machined/pkg/controllers/kubeaccess/serviceaccount/crd_controller.go

@@ -17,7 +17,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	kubeerrors "k8s.io/apimachinery/pkg/api/errors"

internal/app/machined/pkg/controllers/secrets/api.go

@@ -13,8 +13,8 @@ import (
 	"github.com/cosi-project/runtime/pkg/controller"
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 	"go.uber.org/zap"
 
 	"github.com/talos-systems/talos/pkg/grpc/gen"

internal/app/machined/pkg/controllers/secrets/api_test.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/stretchr/testify/suite"
-	"github.com/talos-systems/crypto/x509"
 	"github.com/talos-systems/go-retry/retry"
 
 	"github.com/talos-systems/talos/internal/app/machined/pkg/controllers/ctest"

internal/app/machined/pkg/controllers/secrets/etcd_test.go

@@ -13,10 +13,10 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/internal/app/machined/pkg/controllers/ctest"
 	secretsctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/secrets"

internal/app/machined/pkg/controllers/secrets/kubelet_test.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/stretchr/testify/suite"
-	"github.com/talos-systems/crypto/x509"
 	"github.com/talos-systems/go-retry/retry"
 
 	"github.com/talos-systems/talos/internal/app/machined/pkg/controllers/ctest"

internal/app/machined/pkg/controllers/secrets/kubernetes.go

@@ -15,8 +15,8 @@ import (
 	"github.com/cosi-project/runtime/pkg/controller"
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 	"go.uber.org/zap"
 
 	"github.com/talos-systems/talos/pkg/kubeconfig"

internal/app/machined/pkg/controllers/secrets/kubernetes_test.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/stretchr/testify/suite"
-	"github.com/talos-systems/crypto/x509"
 	"github.com/talos-systems/go-retry/retry"
 	"k8s.io/client-go/tools/clientcmd"
 

internal/app/machined/pkg/controllers/secrets/trustd.go

@@ -14,8 +14,8 @@ import (
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/safe"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 	"go.uber.org/zap"
 
 	"github.com/talos-systems/talos/pkg/machinery/resources/config"

internal/app/machined/pkg/controllers/secrets/trustd_test.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/stretchr/testify/suite"
-	"github.com/talos-systems/crypto/x509"
 	"github.com/talos-systems/go-retry/retry"
 
 	"github.com/talos-systems/talos/internal/app/machined/pkg/controllers/ctest"

internal/app/maintenance/main.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
-	ttls "github.com/talos-systems/crypto/tls"
-	"github.com/talos-systems/crypto/x509"
+	ttls "github.com/siderolabs/crypto/tls"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/talos-systems/go-procfs/procfs"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"

internal/app/trustd/internal/provider/provider.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/state"
-	"github.com/talos-systems/crypto/tls"
+	"github.com/siderolabs/crypto/tls"
 
 	"github.com/talos-systems/talos/pkg/machinery/resources/secrets"
 )

internal/app/trustd/internal/reg/reg.go

@@ -10,7 +10,7 @@ import (
 	"github.com/cosi-project/runtime/pkg/resource"
 	"github.com/cosi-project/runtime/pkg/safe"
 	"github.com/cosi-project/runtime/pkg/state"
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	"google.golang.org/grpc"
 
 	securityapi "github.com/talos-systems/talos/pkg/machinery/api/security"

internal/pkg/containers/cri/containerd/config_test.go

@@ -8,9 +8,9 @@ import (
 	_ "embed"
 	"testing"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
 	"github.com/stretchr/testify/suite"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/internal/pkg/containers/cri/containerd"
 	"github.com/talos-systems/talos/pkg/machinery/config"

internal/pkg/containers/cri/containerd/hosts_test.go

@@ -8,10 +8,10 @@ import (
 	_ "embed"
 	"testing"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/internal/pkg/containers/cri/containerd"
 	"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1"

internal/pkg/etcd/certs.go

@@ -10,7 +10,7 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/machinery/nethelpers"
 	"github.com/talos-systems/talos/pkg/machinery/resources/network"

pkg/grpc/gen/local.go

@@ -5,7 +5,7 @@
 package gen
 
 import (
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 )
 
 // LocalGenerator represents the OS identity generator.

pkg/grpc/gen/remote.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/talos-systems/go-retry/retry"
 	"google.golang.org/grpc"
 

pkg/grpc/middleware/auth/basic/basic.go

@@ -8,7 +8,7 @@ import (
 	"crypto/tls"
 	stdx509 "crypto/x509"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )

pkg/kubeconfig/generate.go

@@ -13,7 +13,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/machinery/config"
 	"github.com/talos-systems/talos/pkg/machinery/constants"

pkg/kubeconfig/generate_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/stretchr/testify/suite"
-	"github.com/talos-systems/crypto/x509"
 	"k8s.io/client-go/tools/clientcmd"
 
 	"github.com/talos-systems/talos/pkg/kubeconfig"

pkg/kubernetes/kubernetes.go

@@ -14,7 +14,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	"github.com/talos-systems/go-retry/retry"
 	"golang.org/x/sync/errgroup"
 	appsv1 "k8s.io/api/apps/v1"

pkg/machinery/client/config/config.go

@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	"gopkg.in/yaml.v3"
 )
 

pkg/machinery/config/provider.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/machinery/config/encoder"
 	"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine"

pkg/machinery/config/types/v1alpha1/generate/generate.go

@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/talos-systems/crypto/x509"
+	"github.com/siderolabs/crypto/x509"
 	tnet "github.com/talos-systems/net"
 
 	"github.com/talos-systems/talos/pkg/machinery/config"

pkg/machinery/config/types/v1alpha1/generate/worker.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"net/url"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 
 	v1alpha1 "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1"
 	"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine"

pkg/machinery/config/types/v1alpha1/v1alpha1_clusterconfig.go

@@ -10,8 +10,8 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/siderolabs/crypto/x509"
 	"github.com/siderolabs/go-pointer"
-	"github.com/talos-systems/crypto/x509"
 	talosnet "github.com/talos-systems/net"
 
 	"github.com/talos-systems/talos/pkg/machinery/config"