go.crypto: gofmt -w -s

R=golang-dev, dave
CC=golang-dev
https://golang.org/cl/6948057

bcrypt/bcrypt.go

@@ -6,7 +6,7 @@
 // algorithm. See http://www.usenix.org/event/usenix99/provos/provos.pdf
 package bcrypt
 
-// The code is a port of Provos and Mazières's C implementation. 
+// The code is a port of Provos and Mazières's C implementation.
 import (
 	"code.google.com/p/go.crypto/blowfish"
 	"crypto/rand"

openpgp/packet/encrypted_key.go

@@ -104,7 +104,7 @@ func SerializeEncryptedKey(w io.Writer, pub *PublicKey, cipherFunc CipherFunctio
 	binary.BigEndian.PutUint64(buf[1:9], pub.KeyId)
 	buf[9] = byte(pub.PubKeyAlgo)
 
-	keyBlock := make([]byte, 1 /* cipher type */ +len(key)+2 /* checksum */ )
+	keyBlock := make([]byte, 1 /* cipher type */ +len(key)+2 /* checksum */)
 	keyBlock[0] = byte(cipherFunc)
 	copy(keyBlock[1:], key)
 	checksum := checksumKeyMaterial(key)

openpgp/packet/private_key.go

@@ -121,7 +121,7 @@ func (pk *PrivateKey) Serialize(w io.Writer) (err error) {
 	if err != nil {
 		return
 	}
-	buf.WriteByte(0 /* no encryption */ )
+	buf.WriteByte(0 /* no encryption */)
 
 	privateKeyBuf := bytes.NewBuffer(nil)
 

openpgp/write_test.go

@@ -169,7 +169,7 @@ func TestEncryption(t *testing.T) {
 		}
 
 		buf := new(bytes.Buffer)
-		w, err := Encrypt(buf, kring[:1], signed, nil, /* no hints */ nil)
+		w, err := Encrypt(buf, kring[:1], signed, nil /* no hints */, nil)
 		if err != nil {
 			t.Errorf("#%d: error in Encrypt: %s", i, err)
 			continue
@@ -187,7 +187,7 @@ func TestEncryption(t *testing.T) {
 			continue
 		}
 
-		md, err := ReadMessage(buf, kring, nil, /* no prompt */ nil)
+		md, err := ReadMessage(buf, kring, nil /* no prompt */, nil)
 		if err != nil {
 			t.Errorf("#%d: error reading message: %s", i, err)
 			continue

scrypt/scrypt.go

@@ -76,7 +76,7 @@ func smix(b []byte, r, N int, v, xy []byte) {
 
 // Key derives a key from the password, salt, and cost parameters, returning
 // a byte slice of length keyLen that can be used as cryptographic key.
-// 
+//
 // N is a CPU/memory cost parameter, which must be a power of two greater than 1.
 // r and p must satisfy r * p < 2³⁰. If the parameters do not satisfy the
 // limits, the function returns a nil byte slice and an error.

ssh/client_auth.go

@@ -57,7 +57,7 @@ func (c *ClientConn) authenticate(session []byte) error {
 }
 
 func keys(m map[string]bool) (s []string) {
-	for k, _ := range m {
+	for k := range m {
 		s = append(s, k)
 	}
 	return