eiac/crypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go.crypto/ssh/agent: prefix errors with "agent".

Browse Source 
R=agl, dave, jpsugar
CC=golang-codereviews
https://golang.org/cl/87810047
This commit is contained in:
Han-Wen Nienhuys
2014-04-15 13:42:07 -07:00
committed by Adam Langley
parent dac81c328b
commit 15264ff7c7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssh/agent/client.go
+10 -10
View File
@@ -296,7 +296,7 @@ func (c *client) List() ([]*Key, error) {
switch msg := msg.(type) {
case *identitiesAnswerAgentMsg:
if msg.NumKeys > maxAgentResponseBytes/8 {
return nil, errors.New("ssh: too many keys in agent reply")
return nil, errors.New("agent: too many keys in agent reply")
}
keys := make([]*Key, msg.NumKeys)
data := msg.Keys
@@ -310,7 +310,7 @@ func (c *client) List() ([]*Key, error) {
}
return keys, nil
case *failureAgentMsg:
return nil, errors.New("ssh: failed to list keys")
return nil, errors.New("agent: failed to list keys")
}
panic("unreachable")
}
@@ -337,7 +337,7 @@ func (c *client) Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error) {
return &sig, nil
case *failureAgentMsg:
return nil, errors.New("ssh: failed to sign challenge")
return nil, errors.New("agent: failed to sign challenge")
}
panic("unreachable")
}
@@ -402,7 +402,7 @@ func (c *client) insertKey(s interface{}, comment string) error {
switch k := s.(type) {
case *rsa.PrivateKey:
if len(k.Primes) != 2 {
return fmt.Errorf("ssh: unsupported RSA key with %d primes", len(k.Primes))
return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
}
k.Precompute()
req = ssh.Marshal(rsaKeyMsg{
@@ -435,7 +435,7 @@ func (c *client) insertKey(s interface{}, comment string) error {
Comments: comment,
})
default:
return fmt.Errorf("ssh: unsupported key type %T", s)
return fmt.Errorf("agent: unsupported key type %T", s)
}
resp, err := c.call(req)
if err != nil {
@@ -444,7 +444,7 @@ func (c *client) insertKey(s interface{}, comment string) error {
if _, ok := resp.(*successAgentMsg); ok {
return nil
}
return errors.New("ssh: failure")
return errors.New("agent: failure")
}
type rsaCertMsg struct {
@@ -486,7 +486,7 @@ func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string
switch k := s.(type) {
case *rsa.PrivateKey:
if len(k.Primes) != 2 {
return fmt.Errorf("ssh: unsupported RSA key with %d primes", len(k.Primes))
return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
}
k.Precompute()
req = ssh.Marshal(rsaCertMsg{
@@ -513,7 +513,7 @@ func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string
Comments: comment,
})
default:
return fmt.Errorf("ssh: unsupported key type %T", s)
return fmt.Errorf("agent: unsupported key type %T", s)
}
signer, err := ssh.NewSignerFromKey(s)
@@ -521,7 +521,7 @@ func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string
return err
}
if bytes.Compare(cert.Key.Marshal(), signer.PublicKey().Marshal()) != 0 {
return errors.New("ssh: signer and cert have different public key")
return errors.New("agent: signer and cert have different public key")
}
resp, err := c.call(req)
@@ -531,7 +531,7 @@ func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string
if _, ok := resp.(*successAgentMsg); ok {
return nil
}
return errors.New("ssh: failure")
return errors.New("agent: failure")
}
// Signers provides a callback for client authentication.