Moved cryptoutil directory up to mdm level.

fleetdm · Jan 6, 2025 · a40237d · a40237d
1 parent 4e7ce73
commit a40237d
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 6 deletions.
diff --git a/pkg/mdm/mdmtest/apple.go b/pkg/mdm/mdmtest/apple.go
@@ -25,8 +25,8 @@ import (
 	"github.com/fleetdm/fleet/v4/server/fleet"
 	apple_mdm "github.com/fleetdm/fleet/v4/server/mdm/apple"
 	"github.com/fleetdm/fleet/v4/server/mdm/nanomdm/mdm"
-	"github.com/fleetdm/fleet/v4/server/mdm/scep/cryptoutil/x509util"
 	scepserver "github.com/fleetdm/fleet/v4/server/mdm/scep/server"
+	"github.com/fleetdm/fleet/v4/server/mdm/scep/x509uti
 	httptransport "github.com/go-kit/kit/transport/http"
 	"github.com/go-kit/log"
 	kitlog "github.com/go-kit/log"

diff --git a/server/mdm/scep/cryptoutil/cryptoutil.go → server/mdm/cryptoutil/cryptoutil.go b/server/mdm/scep/cryptoutil/cryptoutil.go → server/mdm/cryptoutil/cryptoutil.go
@@ -39,6 +39,8 @@ func GenerateSubjectKeyID(pub crypto.PublicKey) ([]byte, error) {
 	return hash[:20], nil
 }
 
+// ParsePrivateKey parses a PEM encoded private key and returns a crypto.PrivateKey.
+// It can be used for private keys passed in from environment variables or command line or files.
 func ParsePrivateKey(privKeyPEM []byte, keyName string) (crypto.PrivateKey, error) {
 	block, _ := pem.Decode(privKeyPEM)
 	if block == nil {

diff --git a/...er/mdm/scep/cryptoutil/cryptoutil_test.go → server/mdm/cryptoutil/cryptoutil_test.go b/...er/mdm/scep/cryptoutil/cryptoutil_test.go → server/mdm/cryptoutil/cryptoutil_test.go
diff --git a/server/mdm/scep/cryptoutil/doc.go → server/mdm/cryptoutil/doc.go b/server/mdm/scep/cryptoutil/doc.go → server/mdm/cryptoutil/doc.go
diff --git a/...er/mdm/scep/cryptoutil/testdata/pkcs1.key → server/mdm/cryptoutil/testdata/pkcs1.key b/...er/mdm/scep/cryptoutil/testdata/pkcs1.key → server/mdm/cryptoutil/testdata/pkcs1.key
diff --git a/...p/cryptoutil/testdata/pkcs8-encrypted.key → ...m/cryptoutil/testdata/pkcs8-encrypted.key b/...p/cryptoutil/testdata/pkcs8-encrypted.key → ...m/cryptoutil/testdata/pkcs8-encrypted.key
diff --git a/...dm/scep/cryptoutil/testdata/pkcs8-rsa.key → server/mdm/cryptoutil/testdata/pkcs8-rsa.key b/...dm/scep/cryptoutil/testdata/pkcs8-rsa.key → server/mdm/cryptoutil/testdata/pkcs8-rsa.key
diff --git a/...scep/cryptoutil/testdata/pkcs8-x25519.key → .../mdm/cryptoutil/testdata/pkcs8-x25519.key b/...scep/cryptoutil/testdata/pkcs8-x25519.key → .../mdm/cryptoutil/testdata/pkcs8-x25519.key
diff --git a/server/mdm/scep/cmd/scepclient/csr.go b/server/mdm/scep/cmd/scepclient/csr.go
@@ -10,7 +10,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/fleetdm/fleet/v4/server/mdm/scep/cryptoutil/x509util"
+	"github.com/fleetdm/fleet/v4/server/mdm/scep/x509util"
 )
 
 const (

diff --git a/server/mdm/scep/depot/cacert.go b/server/mdm/scep/depot/cacert.go
@@ -8,7 +8,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/fleetdm/fleet/v4/server/mdm/scep/cryptoutil"
+	"github.com/fleetdm/fleet/v4/server/mdm/cryptoutil"
 )
 
 // CACert represents a new self-signed CA certificate

diff --git a/server/mdm/scep/depot/signer.go b/server/mdm/scep/depot/signer.go
@@ -5,7 +5,7 @@ import (
 	"crypto/x509"
 	"time"
 
-	"github.com/fleetdm/fleet/v4/server/mdm/scep/cryptoutil"
+	"github.com/fleetdm/fleet/v4/server/mdm/cryptoutil"
 	"github.com/smallstep/scep"
 )
 

diff --git a/server/mdm/scep/cryptoutil/x509util/doc.go → server/mdm/scep/x509util/doc.go b/server/mdm/scep/cryptoutil/x509util/doc.go → server/mdm/scep/x509util/doc.go
diff --git a/.../mdm/scep/cryptoutil/x509util/x509util.go → server/mdm/scep/x509util/x509util.go b/.../mdm/scep/cryptoutil/x509util/x509util.go → server/mdm/scep/x509util/x509util.go
diff --git a/...scep/cryptoutil/x509util/x509util_test.go → server/mdm/scep/x509util/x509util_test.go b/...scep/cryptoutil/x509util/x509util_test.go → server/mdm/scep/x509util/x509util_test.go
diff --git a/server/service/mdm.go b/server/service/mdm.go
@@ -30,8 +30,8 @@ import (
 	"github.com/fleetdm/fleet/v4/server/mdm"
 	apple_mdm "github.com/fleetdm/fleet/v4/server/mdm/apple"
 	"github.com/fleetdm/fleet/v4/server/mdm/assets"
+	"github.com/fleetdm/fleet/v4/server/mdm/cryptoutil"
 	nanomdm "github.com/fleetdm/fleet/v4/server/mdm/nanomdm/mdm"
-	"github.com/fleetdm/fleet/v4/server/mdm/scep/cryptoutil"
 	"github.com/fleetdm/fleet/v4/server/ptr"
 	"github.com/go-kit/log/level"
 	"github.com/go-sql-driver/mysql"

diff --git a/server/service/mdm_test.go b/server/service/mdm_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/fleetdm/fleet/v4/server/contexts/license"
 	"github.com/fleetdm/fleet/v4/server/contexts/viewer"
 	"github.com/fleetdm/fleet/v4/server/fleet"
-	"github.com/fleetdm/fleet/v4/server/mdm/scep/cryptoutil/x509util"
+	"github.com/fleetdm/fleet/v4/server/mdm/scep/x509util"
 	"github.com/fleetdm/fleet/v4/server/mock"
 	"github.com/fleetdm/fleet/v4/server/ptr"
 	"github.com/fleetdm/fleet/v4/server/test"
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"io/ioutil"
     	"os"
-    	"github.com/fleetdm/fleet/v4/server/mdm/scep/cryptoutil/x509util"
+    	"github.com/fleetdm/fleet/v4/server/mdm/scep/x509util"
     )
     const (
@@ Expand Down @@