docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating calls to CryptoService.Create to pass role name

This commit is contained in:
David Lawrence 2015-06-18 13:53:10 -07:00
parent 0ee61e25c9
commit 5b64c7b084
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -47,7 +47,7 @@
},
{
"ImportPath": "github.com/endophage/gotuf",
"Rev": "de9ae3ede560ae61c3653aa98a5c07587bbb04a7"
"Rev": "98e5e9aeb4dd213e0be82df82575930a1e6a2122"
},
{
"ImportPath": "github.com/go-sql-driver/mysql",

2
Godeps/_workspace/src/github.com/endophage/gotuf/signed/ed25519.go generated vendored
View File

@ -46,7 +46,7 @@ func (trust *Ed25519) Sign(keyIDs []string, toSign []byte) ([]data.Signature, er
}
func (trust *Ed25519) Create() (*data.PublicKey, error) {
func (trust *Ed25519) Create(role string) (*data.PublicKey, error) {
pub, priv, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
return nil, err

2
Godeps/_workspace/src/github.com/endophage/gotuf/signed/interface.go generated vendored
View File

@ -18,7 +18,7 @@ type SigningService interface {
type KeyService interface {
// Create issues a new key pair and is responsible for loading
// the private key into the appropriate signing service.
Create() (*data.PublicKey, error)
Create(role string) (*data.PublicKey, error)
// PublicKeys return the PublicKey instances for the given KeyIDs
// PublicKeys(keyIDs ...string) (map[string]*data.PublicKey, error)

4
Godeps/_workspace/src/github.com/endophage/gotuf/signed/sign.go generated vendored
View File

@ -45,8 +45,8 @@ func (signer *Signer) Sign(s *data.Signed, keys ...*data.PublicKey) error {
return nil
}
func (signer *Signer) Create() (*data.PublicKey, error) {
key, err := signer.service.Create()
func (signer *Signer) Create(role string) (*data.PublicKey, error) {
key, err := signer.service.Create(role)
return key, err
}

4
Godeps/_workspace/src/github.com/endophage/gotuf/signed/sign_test.go generated vendored
View File

@ -35,7 +35,7 @@ func TestBasicSign(t *testing.T) {
signer := Signer{&MockCryptoService{
testKey: keys.PublicKey{ID: "testID"},
}}
key, err := signer.Create()
key, err := signer.Create("root")
if err != nil {
t.Fatal(err)
}
@ -104,7 +104,7 @@ func TestCreate(t *testing.T) {
testKey: keys.PublicKey{ID: "testID"},
}}
key, err := signer.Create()
key, err := signer.Create("root")
if err != nil {
t.Fatal(err)

12
Godeps/_workspace/src/github.com/endophage/gotuf/signed/verify_test.go generated vendored
View File

@ -78,7 +78,7 @@ func (VerifySuite) Test(c *C) {
{
name: "more than enough signatures",
mut: func(t *test) {
k, _ := signer.Create()
k, _ := signer.Create("root")
signer.Sign(t.s, k)
t.keys = append(t.keys, k)
t.roles["root"].KeyIDs = append(t.roles["root"].KeyIDs, k.ID)
@ -95,14 +95,14 @@ func (VerifySuite) Test(c *C) {
{
name: "unknown key",
mut: func(t *test) {
k, _ := signer.Create()
k, _ := signer.Create("root")
signer.Sign(t.s, k)
},
},
{
name: "unknown key below threshold",
mut: func(t *test) {
k, _ := signer.Create()
k, _ := signer.Create("root")
signer.Sign(t.s, k)
t.roles["root"].Threshold = 2
},
@ -111,7 +111,7 @@ func (VerifySuite) Test(c *C) {
{
name: "unknown keys in db",
mut: func(t *test) {
k, _ := signer.Create()
k, _ := signer.Create("root")
signer.Sign(t.s, k)
t.keys = append(t.keys, k)
},
@ -119,7 +119,7 @@ func (VerifySuite) Test(c *C) {
{
name: "unknown keys in db below threshold",
mut: func(t *test) {
k, _ := signer.Create()
k, _ := signer.Create("root")
signer.Sign(t.s, k)
t.keys = append(t.keys, k)
t.roles["root"].Threshold = 2
@ -157,7 +157,7 @@ func (VerifySuite) Test(c *C) {
t.typ = t.role
}
if t.keys == nil && t.s == nil {
k, _ := signer.Create()
k, _ := signer.Create("root")
meta := &signedMeta{Type: t.typ, Version: t.ver, Expires: *t.exp}
b, err := cjson.Marshal(meta)

12
Godeps/_workspace/src/github.com/endophage/gotuf/tuf_test.go generated vendored
View File

@ -15,19 +15,19 @@ import (
func initRepo(t *testing.T, signer *signed.Signer, keyDB *keys.KeyDB) *TufRepo {
rootKey, err := signer.Create()
rootKey, err := signer.Create("root")
if err != nil {
t.Fatal(err)
}
targetsKey, err := signer.Create()
targetsKey, err := signer.Create("targets")
if err != nil {
t.Fatal(err)
}
snapshotKey, err := signer.Create()
snapshotKey, err := signer.Create("snapshot")
if err != nil {
t.Fatal(err)
}
timestampKey, err := signer.Create()
timestampKey, err := signer.Create("timestamp")
if err != nil {
t.Fatal(err)
}
@ -136,7 +136,7 @@ func TestUpdateDelegations(t *testing.T) {
keyDB := keys.NewDB()
repo := initRepo(t, signer, keyDB)
testKey, err := signer.Create()
testKey, err := signer.Create("targets/test")
if err != nil {
t.Fatal(err)
}
@ -150,7 +150,7 @@ func TestUpdateDelegations(t *testing.T) {
t.Fatal(err)
}
testDeepKey, err := signer.Create()
testDeepKey, err := signer.Create("targets/test/deep")
if err != nil {
t.Fatal(err)
}

8
cmd/notary/tuf.go
View File

@ -162,10 +162,10 @@ func tufInit(cmd *cobra.Command, args []string) {
kdb := keys.NewDB()
signer := signed.NewSigner(NewCryptoService(gun))
rootKey, err := signer.Create()
targetsKey, err := signer.Create()
snapshotKey, err := signer.Create()
timestampKey, err := signer.Create()
rootKey, err := signer.Create("root")
targetsKey, err := signer.Create("targets")
snapshotKey, err := signer.Create("snapshot")
timestampKey, err := signer.Create("timestamp")
kdb.AddKey(rootKey)
kdb.AddKey(targetsKey)