From 0b331490d79b1b7211ff8d8b70b4961758f22437 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 6 Jul 2015 20:00:52 -0700 Subject: [PATCH] populate key and signature type from rufus's Algorithm field Signed-off-by: David Lawrence (github: endophage) --- signer/rufus_trust.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/signer/rufus_trust.go b/signer/rufus_trust.go index 0221df4865..24438d55b8 100644 --- a/signer/rufus_trust.go +++ b/signer/rufus_trust.go @@ -53,7 +53,7 @@ func (trust *RufusSigner) Sign(keyIDs []string, toSign []byte) ([]data.Signature } signatures = append(signatures, data.Signature{ KeyID: sig.KeyID.ID, - Method: "TODOALGORITHM", + Method: sig.Algorithm, Signature: sig.Content, }) } @@ -67,7 +67,7 @@ func (trust *RufusSigner) Create(role string) (*data.PublicKey, error) { return nil, err } //TODO(mccauley): Update API to return algorithm and/or take it as a param - public := data.NewPublicKey("TODOALGORITHM", publicKey.PublicKey) + public := data.NewPublicKey(publicKey.Algorithm, publicKey.PublicKey) return public, nil } @@ -76,12 +76,12 @@ func (trust *RufusSigner) PublicKeys(keyIDs ...string) (map[string]*data.PublicK publicKeys := make(map[string]*data.PublicKey) for _, ID := range keyIDs { keyID := pb.KeyID{ID: ID} - sig, err := trust.kmClient.GetKeyInfo(context.Background(), &keyID) + public, err := trust.kmClient.GetKeyInfo(context.Background(), &keyID) if err != nil { return nil, err } - publicKeys[sig.KeyID.ID] = - data.NewPublicKey("TODOALGORITHM", sig.PublicKey) + publicKeys[public.KeyID.ID] = + data.NewPublicKey(public.Algorithm, public.PublicKey) } return publicKeys, nil }