From ae7459b5f2e355748e5bb8cbcc751081c13e4b43 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 30 Nov 2015 16:38:14 -0800 Subject: [PATCH] updating commend and renaming test per comments Signed-off-by: David Lawrence (github: endophage) --- cryptoservice/crypto_service_test.go | 14 +++++--------- tuf/signed/interface.go | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cryptoservice/crypto_service_test.go b/cryptoservice/crypto_service_test.go index e1f73441b7..b46fc706b6 100644 --- a/cryptoservice/crypto_service_test.go +++ b/cryptoservice/crypto_service_test.go @@ -127,13 +127,11 @@ func (c CryptoServiceTester) TestSignNoMatchingKeys(t *testing.T) { assert.Error(t, err, c.errorMsg("Should not have found private key")) } -// If there are multiple keystores, even if all of them have the same key, -// only one signature is returned. -func (c CryptoServiceTester) TestSignWhenMultipleKeystores(t *testing.T) { +// Test GetPrivateKey succeeds when multiple keystores have the same key +func (c CryptoServiceTester) TestGetPrivateKeyMultipleKeystores(t *testing.T) { cryptoService := c.cryptoServiceFactory() cryptoService.keyStores = append(cryptoService.keyStores, trustmanager.NewKeyMemoryStore(passphraseRetriever)) - content := []byte("this is a secret") privKey, err := trustmanager.GenerateECDSAKey(rand.Reader) assert.NoError(t, err, c.errorMsg("error creating key")) @@ -143,12 +141,10 @@ func (c CryptoServiceTester) TestSignWhenMultipleKeystores(t *testing.T) { assert.NoError(t, err) } - privKey, role, err := cryptoService.GetPrivateKey(privKey.ID()) + foundKey, role, err := cryptoService.GetPrivateKey(privKey.ID()) assert.NoError(t, err, c.errorMsg("failed to get private key")) assert.Equal(t, c.role, role) - - _, err = privKey.Sign(rand.Reader, content, nil) - assert.NoError(t, err, c.errorMsg("signing failed")) + assert.Equal(t, privKey.ID(), foundKey.ID()) } // asserts that removing key that exists succeeds @@ -278,7 +274,7 @@ func testCryptoService(t *testing.T, gun string) { cst.TestGetNonexistentKey(t) cst.TestSignWithKey(t) cst.TestSignNoMatchingKeys(t) - cst.TestSignWhenMultipleKeystores(t) + cst.TestGetPrivateKeyMultipleKeystores(t) cst.TestRemoveCreatedKey(t) cst.TestRemoveFromMultipleKeystores(t) cst.TestListFromMultipleKeystores(t) diff --git a/tuf/signed/interface.go b/tuf/signed/interface.go index 0419646446..d1695c99bc 100644 --- a/tuf/signed/interface.go +++ b/tuf/signed/interface.go @@ -36,8 +36,8 @@ type KeyService interface { ImportRootKey(source io.Reader) error } -// CryptoService defines a unified Signing and Key Service as this -// will be most useful for most applications. +// CryptoService is deprecated and all instances of its use should be +// replaced with KeyService type CryptoService interface { KeyService }