Renaming module to v2

challenge/challenge.go

@@ -5,8 +5,8 @@ import (
 	"crypto/x509"
 	"errors"
 
-	"github.com/micromdm/scep/scep"
-	scepserver "github.com/micromdm/scep/server"
+	"github.com/micromdm/scep/v2/scep"
+	scepserver "github.com/micromdm/scep/v2/server"
 )
 
 // Store is a dynamic challenge password cache.

challenge/challenge_bolt_test.go

@@ -5,10 +5,11 @@ import (
 	"os"
 	"testing"
 
+	challengestore "github.com/micromdm/scep/v2/challenge/bolt"
+	"github.com/micromdm/scep/v2/scep"
+	scepserver "github.com/micromdm/scep/v2/server"
+
 	"github.com/boltdb/bolt"
-	challengestore "github.com/micromdm/scep/challenge/bolt"
-	"github.com/micromdm/scep/scep"
-	scepserver "github.com/micromdm/scep/server"
 )
 
 func TestDynamicChallenge(t *testing.T) {

client/client.go

@@ -1,10 +1,10 @@
 package scepclient
 
 import (
+	scepserver "github.com/micromdm/scep/v2/server"
+
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-
-	"github.com/micromdm/scep/server"
 )
 
 // Client is a SCEP Client

cmd/scepclient/csr.go

@@ -10,7 +10,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/micromdm/scep/cryptoutil/x509util"
+	"github.com/micromdm/scep/v2/cryptoutil/x509util"
 )
 
 const (

cmd/scepclient/scepclient.go

@@ -15,10 +15,11 @@ import (
 	"strings"
 	"time"
 
+	scepclient "github.com/micromdm/scep/v2/client"
+	"github.com/micromdm/scep/v2/scep"
+
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	scepclient "github.com/micromdm/scep/client"
-	"github.com/micromdm/scep/scep"
 	"github.com/pkg/errors"
 )
 

cmd/scepserver/scepserver.go

@@ -17,14 +17,15 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/micromdm/scep/v2/cryptoutil"
+	"github.com/micromdm/scep/v2/csrverifier"
+	executablecsrverifier "github.com/micromdm/scep/v2/csrverifier/executable"
+	scepdepot "github.com/micromdm/scep/v2/depot"
+	"github.com/micromdm/scep/v2/depot/file"
+	scepserver "github.com/micromdm/scep/v2/server"
+
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"github.com/micromdm/scep/cryptoutil"
-	"github.com/micromdm/scep/csrverifier"
-	executablecsrverifier "github.com/micromdm/scep/csrverifier/executable"
-	scepdepot "github.com/micromdm/scep/depot"
-	"github.com/micromdm/scep/depot/file"
-	scepserver "github.com/micromdm/scep/server"
 )
 
 // version info

csrverifier/csrverifier.go

@@ -5,8 +5,8 @@ import (
 	"crypto/x509"
 	"errors"
 
-	"github.com/micromdm/scep/scep"
-	scepserver "github.com/micromdm/scep/server"
+	"github.com/micromdm/scep/v2/scep"
+	scepserver "github.com/micromdm/scep/v2/server"
 )
 
 // CSRVerifier verifies the raw decrypted CSR.

depot/bolt/depot.go

@@ -11,8 +11,9 @@ import (
 	"math/big"
 	"time"
 
+	"github.com/micromdm/scep/v2/cryptoutil"
+
 	"github.com/boltdb/bolt"
-	"github.com/micromdm/scep/cryptoutil"
 )
 
 // Depot implements a SCEP certifiacte store using boltdb.

depot/signer.go

@@ -5,8 +5,8 @@ import (
 	"crypto/x509"
 	"time"
 
-	"github.com/micromdm/scep/cryptoutil"
-	"github.com/micromdm/scep/scep"
+	"github.com/micromdm/scep/v2/cryptoutil"
+	"github.com/micromdm/scep/v2/scep"
 )
 
 // Signer signs x509 certificates and stores them in a Depot

go.mod

@@ -1,4 +1,4 @@
-module github.com/micromdm/scep
+module github.com/micromdm/scep/v2
 
 go 1.16
 

scep/scep.go

@@ -12,13 +12,13 @@ import (
 	"encoding/asn1"
 	"encoding/base64"
 
+	"github.com/micromdm/scep/v2/cryptoutil"
+	"github.com/micromdm/scep/v2/cryptoutil/x509util"
+
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
-	"github.com/micromdm/scep/cryptoutil"
 	"github.com/pkg/errors"
 	"go.mozilla.org/pkcs7"
-
-	"github.com/micromdm/scep/cryptoutil/x509util"
 )
 
 // errors

scep/scep_test.go

@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/micromdm/scep/cryptoutil"
-	"github.com/micromdm/scep/scep"
+	"github.com/micromdm/scep/v2/cryptoutil"
+	"github.com/micromdm/scep/v2/scep"
 )
 
 func testParsePKIMessage(t *testing.T, data []byte) *scep.PKIMessage {

server/csrsigner.go

@@ -5,7 +5,7 @@ import (
 	"crypto/x509"
 	"errors"
 
-	"github.com/micromdm/scep/scep"
+	"github.com/micromdm/scep/v2/scep"
 )
 
 // CSRSigner is a handler for CSR signing by the CA/RA

server/csrsigner_test.go

@@ -3,7 +3,7 @@ package scepserver
 import (
 	"testing"
 
-	"github.com/micromdm/scep/scep"
+	"github.com/micromdm/scep/v2/scep"
 )
 
 func TestChallengeMiddleware(t *testing.T) {

server/service.go

@@ -6,7 +6,7 @@ import (
 	"crypto/x509"
 	"errors"
 
-	"github.com/micromdm/scep/scep"
+	"github.com/micromdm/scep/v2/scep"
 
 	"github.com/go-kit/kit/log"
 )

server/service_bolt_test.go

@@ -14,12 +14,13 @@ import (
 	"testing"
 	"time"
 
+	challengestore "github.com/micromdm/scep/v2/challenge/bolt"
+	scepdepot "github.com/micromdm/scep/v2/depot"
+	boltdepot "github.com/micromdm/scep/v2/depot/bolt"
+	"github.com/micromdm/scep/v2/scep"
+	scepserver "github.com/micromdm/scep/v2/server"
+
 	"github.com/boltdb/bolt"
-	challengestore "github.com/micromdm/scep/challenge/bolt"
-	scepdepot "github.com/micromdm/scep/depot"
-	boltdepot "github.com/micromdm/scep/depot/bolt"
-	"github.com/micromdm/scep/scep"
-	scepserver "github.com/micromdm/scep/server"
 )
 
 func TestCaCert(t *testing.T) {

server/transport_test.go

@@ -12,9 +12,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/micromdm/scep/depot"
-	filedepot "github.com/micromdm/scep/depot/file"
-	scepserver "github.com/micromdm/scep/server"
+	"github.com/micromdm/scep/v2/depot"
+	filedepot "github.com/micromdm/scep/v2/depot/file"
+	scepserver "github.com/micromdm/scep/v2/server"
 
 	kitlog "github.com/go-kit/kit/log"
 )