DefaultSignerFactory has been deleted

Key protobuf to crypto.Signer conversion is now handled by a global
registry of handler funcs.

Author: Rob Percival

trillian/ctfe/ct_server/main.go

@@ -32,7 +32,6 @@ import (
 	"github.com/google/certificate-transparency-go/trillian/ctfe/configpb"
 	"github.com/google/certificate-transparency-go/trillian/util"
 	"github.com/google/trillian"
-	"github.com/google/trillian/crypto/keys"
 	"github.com/google/trillian/monitoring/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"google.golang.org/grpc"
@@ -117,10 +116,8 @@ func main() {
 	defer conn.Close()
 	client := trillian.NewTrillianLogClient(conn)
 
-	sf := &keys.DefaultSignerFactory{}
-
 	for _, c := range cfg {
-		handlers, err := ctfe.SetUpInstance(ctx, client, c, sf, *rpcDeadlineFlag, prometheus.MetricFactory{})
+		handlers, err := ctfe.SetUpInstance(ctx, client, c, *rpcDeadlineFlag, prometheus.MetricFactory{})
 		if err != nil {
 			glog.Exitf("Failed to set up log instance for %+v: %v", cfg, err)
 		}

trillian/ctfe/instance.go

@@ -77,7 +77,7 @@ var stringToKeyUsage = map[string]x509.ExtKeyUsage{
 
 // SetUpInstance sets up a log instance that uses the specified client to communicate
 // with the Trillian RPC back end.
-func SetUpInstance(ctx context.Context, client trillian.TrillianLogClient, cfg *configpb.LogConfig, sf keys.SignerFactory, deadline time.Duration, mf monitoring.MetricFactory) (*PathHandlers, error) {
+func SetUpInstance(ctx context.Context, client trillian.TrillianLogClient, cfg *configpb.LogConfig, deadline time.Duration, mf monitoring.MetricFactory) (*PathHandlers, error) {
 	// Check config validity.
 	if len(cfg.RootsPemFile) == 0 {
 		return nil, errors.New("need to specify RootsPemFile")
@@ -100,7 +100,7 @@ func SetUpInstance(ctx context.Context, client trillian.TrillianLogClient, cfg *
 		return nil, fmt.Errorf("failed to unmarshal cfg.PrivateKey: %v", err)
 	}
 
-	key, err := sf.NewSigner(ctx, keyProto.Message)
+	key, err := keys.NewSigner(ctx, keyProto.Message)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load private key: %v", err)
 	}

trillian/ctfe/instance_test.go

@@ -20,18 +20,19 @@ import (
 	"testing"
 	"time"
 
+	// Register PEMKeyFile ProtoHandler
+	_ "github.com/google/trillian/crypto/keys/pem/proto"
+
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
 	ct "github.com/google/certificate-transparency-go"
 	"github.com/google/certificate-transparency-go/trillian/ctfe/configpb"
-	"github.com/google/trillian/crypto/keys"
 	"github.com/google/trillian/crypto/keyspb"
 	"github.com/google/trillian/monitoring"
 )
 
 func TestSetUpInstance(t *testing.T) {
 	ctx := context.Background()
-	sf := &keys.DefaultSignerFactory{}
 
 	privKey, err := ptypes.MarshalAny(&keyspb.PEMKeyFile{Path: "../testdata/ct-http-server.privkey.pem", Password: "dirk"})
 	if err != nil {
@@ -155,8 +156,7 @@ func TestSetUpInstance(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		_, err := SetUpInstance(ctx, nil, &test.cfg, sf, time.Second, monitoring.InertMetricFactory{})
-		if err != nil {
+		if _, err := SetUpInstance(ctx, nil, &test.cfg, time.Second, monitoring.InertMetricFactory{}); err != nil {
 			if test.errStr == "" {
 				t.Errorf("(%v).SetUpInstance()=_,%v; want _,nil", test.desc, err)
 			} else if !strings.Contains(err.Error(), test.errStr) {

trillian/integration/ct_integration_test.go

@@ -24,6 +24,9 @@ import (
 	"testing"
 	"time"
 
+	// Register PEMKeyFile ProtoHandler
+	_ "github.com/google/trillian/crypto/keys/pem/proto"
+
 	"github.com/golang/protobuf/ptypes"
 	"github.com/google/certificate-transparency-go/trillian/ctfe"
 	"github.com/google/certificate-transparency-go/trillian/ctfe/configpb"

trillian/integration/logenv.go

@@ -26,7 +26,6 @@ import (
 	"github.com/google/certificate-transparency-go/trillian/ctfe"
 	"github.com/google/certificate-transparency-go/trillian/ctfe/configpb"
 	"github.com/google/trillian"
-	"github.com/google/trillian/crypto/keys"
 	"github.com/google/trillian/monitoring/prometheus"
 	"github.com/google/trillian/testonly/integration"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -72,9 +71,8 @@ func NewCTLogEnv(ctx context.Context, cfgs []*configpb.LogConfig, numSequencers
 	go func(env *integration.LogEnv, server *http.Server, listener net.Listener, cfgs []*configpb.LogConfig) {
 		defer wg.Done()
 		client := trillian.NewTrillianLogClient(env.ClientConn)
-		sf := &keys.DefaultSignerFactory{}
 		for _, cfg := range cfgs {
-			handlers, err := ctfe.SetUpInstance(ctx, client, cfg, sf, 10*time.Second, prometheus.MetricFactory{})
+			handlers, err := ctfe.SetUpInstance(ctx, client, cfg, 10*time.Second, prometheus.MetricFactory{})
 			if err != nil {
 				glog.Fatalf("Failed to set up log instance for %+v: %v", cfg, err)
 			}