From 577ae2abf995653ad750624b223792d65a654333 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 26 Oct 2013 03:25:59 +1100 Subject: [PATCH] go.crypto/ssh: cosmetic: unnest signing code for public key auth. R=dave CC=golang-dev https://golang.org/cl/15930044 --- ssh/client_auth.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ssh/client_auth.go b/ssh/client_auth.go index 6f464ec..29be0ca 100644 --- a/ssh/client_auth.go +++ b/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{