Browse Source

go.crypto/ssh: cosmetic: unnest signing code for public key auth.

R=dave
CC=golang-dev
https://golang.org/cl/15930044
Han-Wen Nienhuys 12 years ago
parent
commit
577ae2abf9
1 changed files with 4 additions and 3 deletions
  1. 4 3
      ssh/client_auth.go

+ 4 - 3
ssh/client_auth.go

@@ -215,16 +215,17 @@ func (p *publickeyAuth) auth(session []byte, user string, c packetConn, rand io.
 	for i, key := range validKeys {
 		pubkey := MarshalPublicKey(key)
 		algoname := key.PublicKeyAlgo()
-		sign, err := p.Sign(i, rand, buildDataSignedForAuth(session, userAuthRequestMsg{
+		data := buildDataSignedForAuth(session, userAuthRequestMsg{
 			User:    user,
 			Service: serviceSSH,
 			Method:  p.method(),
-		}, []byte(algoname), pubkey))
+		}, []byte(algoname), pubkey)
+		sigBlob, err := p.Sign(i, rand, data)
 		if err != nil {
 			return false, nil, err
 		}
 		// manually wrap the serialized signature in a string
-		s := serializeSignature(key.PublicKeyAlgo(), sign)
+		s := serializeSignature(key.PublicKeyAlgo(), sigBlob)
 		sig := make([]byte, stringLength(len(s)))
 		marshalString(sig, s)
 		msg := publickeyAuthMsg{