Allow custom priv key bytes on all platforms

config/cfg.go

@@ -24,6 +24,19 @@ type CfgT struct {
 	ClientSpecific *map[string]any `json:"clientSpecific"`
 }
 
+// Load loads libmuttoncfg.json and returns the configuration.
+func Load() (*CfgT, error) {
+	cfgBytes, err := os.ReadFile(global.CfgPath)
+	if err != nil {
+		return nil, errors.New("unable to load libmuttoncfg.json: " + err.Error())
+	}
+	var cfg CfgT
+	if err = json.Unmarshal(cfgBytes, &cfg); err != nil {
+		return nil, errors.New("unable to unmarshal libmuttoncfg.json: " + err.Error())
+	}
+	return &cfg, nil
+}
+
 // Write writes cfg to libmuttoncfg.json.
 // If used in append mode, any nil values in the
 // input cfg will be substituted with the existing values.

config/load_GENERIC.go

@@ -1,24 +0,0 @@
-//go:build !ios
-
-package config
-
-import (
-	"encoding/json"
-	"errors"
-	"os"
-
-	"github.com/rwinkhart/libmutton/global"
-)
-
-// Load loads libmuttoncfg.json and returns the configuration.
-func Load() (*CfgT, error) {
-	cfgBytes, err := os.ReadFile(global.CfgPath)
-	if err != nil {
-		return nil, errors.New("unable to load libmuttoncfg.json: " + err.Error())
-	}
-	var cfg CfgT
-	if err = json.Unmarshal(cfgBytes, &cfg); err != nil {
-		return nil, errors.New("unable to unmarshal libmuttoncfg.json: " + err.Error())
-	}
-	return &cfg, nil
-}

config/load_IOS.go

@@ -1,27 +0,0 @@
-//go:build ios
-
-package config
-
-import (
-	"encoding/json"
-	"errors"
-	"os"
-
-	"github.com/rwinkhart/libmutton/global"
-)
-
-// Load loads libmuttoncfg.json and returns the configuration.
-func Load() (*CfgT, error) {
-	cfgBytes, err := os.ReadFile(global.CfgPath)
-	if err != nil {
-		return nil, errors.New("unable to load libmuttoncfg.json: " + err.Error())
-	}
-	var cfg CfgT
-	if err = json.Unmarshal(cfgBytes, &cfg); err != nil {
-		return nil, errors.New("unable to unmarshal libmuttoncfg.json: " + err.Error())
-	}
-
-	// iOS stores a relative path to account for the ever-changing app UUID
-	cfg.Libmutton.SSHKeyPath = new(global.SSHDir + *cfg.Libmutton.SSHKeyPath)
-	return &cfg, nil
-}