gofmt-ify crypto

R=agl
CC=rsc
http://go/go-review/1017032

diff --git a/src/pkg/crypto/block/ecb_test.go b/src/pkg/crypto/block/ecb_test.go
index 9576d4e28556b7e0d72de6832c2c468027f9f682..664c4f4e10cd9b343a3706c7f637d9601343e903 100644 (file)
--- a/src/pkg/crypto/block/ecb_test.go
+++ b/src/pkg/crypto/block/ecb_test.go
@@ -15,9 +15,9 @@ import (
 // Simple Cipher for testing: adds an incrementing amount
 // to each byte in each
 type IncCipher struct {
-       blockSize int;
-       delta byte;
-       encrypting bool;
+       blockSize       int;
+       delta           byte;
+       encrypting      bool;
 }
 
 func (c *IncCipher) BlockSize() int {
@@ -60,10 +60,10 @@ func TestECBEncrypter(t *testing.T) {
                // compute encrypted version
                delta := byte(0);
                for i := 0; i < len(crypt); i++ {
-                       if i % block == 0 {
+                       if i%block == 0 {
                                delta++;
                        }
-                       crypt[i] = plain[i] + delta;
+                       crypt[i] = plain[i]+delta;
                }
 
                for frag := 0; frag < 2; frag++ {
@@ -110,24 +110,24 @@ func TestECBEncrypter(t *testing.T) {
 }
 
 func testECBDecrypter(t *testing.T, maxio int) {
-       var readers = []func(io.Reader) io.Reader {
-               func (r io.Reader) io.Reader { return r },
+       var readers = []func(io.Reader) io.Reader{
+               func(r io.Reader) io.Reader { return r },
                iotest.OneByteReader,
                iotest.HalfReader,
        };
        var plain, crypt [256]byte;
        for i := 0; i < len(plain); i++ {
-               plain[i] = byte(255 - i);
+               plain[i] = byte(255-i);
        }
        b := new(bytes.Buffer);
        for block := 1; block <= 64 && block <= maxio; block *= 2 {
                // compute encrypted version
                delta := byte(0);
                for i := 0; i < len(crypt); i++ {
-                       if i % block == 0 {
+                       if i%block == 0 {
                                delta++;
                        }
-                       crypt[i] = plain[i] + delta;
+                       crypt[i] = plain[i]+delta;
                }
 
                for mode := 0; mode < len(readers); mode++ {

diff --git a/src/pkg/crypto/block/xor_test.go b/src/pkg/crypto/block/xor_test.go
index 6c686f6cd0d2bbd26378f94a77738d4b71aa8f1a..671e319986c8c85849b828b8f4d298345f985c33 100644 (file)
--- a/src/pkg/crypto/block/xor_test.go
+++ b/src/pkg/crypto/block/xor_test.go
@@ -98,9 +98,7 @@ func TestXorWriter(t *testing.T) {
 
 func testXorReader(t *testing.T, maxio int) {
        var readers = []func(io.Reader) io.Reader{
-               func(r io.Reader) io.Reader {
-                       return r;
-               },
+               func(r io.Reader) io.Reader { return r },
                iotest.OneByteReader,
                iotest.HalfReader,
        };

diff --git a/src/pkg/crypto/tls/common.go b/src/pkg/crypto/tls/common.go
index 31bdb84da76604303f2c5523a3682998c0390c8b..2145b7b55648b16316ddfa73d27e2d3881e18c29 100644 (file)
--- a/src/pkg/crypto/tls/common.go
+++ b/src/pkg/crypto/tls/common.go
@@ -106,7 +106,8 @@ func mutualVersion(theirMajor, theirMinor uint8) (major, minor uint8, ok bool) {
 // A nop implements the NULL encryption and MAC algorithms.
 type nop struct{}
 
-func (nop) XORKeyStream(buf []byte) {}
+func (nop) XORKeyStream(buf []byte) {
+}
 
 func (nop) Write(buf []byte) (int, os.Error) {
        return len(buf), nil;
@@ -116,7 +117,8 @@ func (nop) Sum() []byte {
        return nil;
 }
 
-func (nop) Reset() {}
+func (nop) Reset() {
+}
 
 func (nop) Size() int {
        return 0;

diff --git a/src/pkg/crypto/tls/record_write.go b/src/pkg/crypto/tls/record_write.go
index 241dbec8f9cbe300c816f30e03cdfcf4bbfac4d8..38135c9799f8aa0a00b2d9773994669f678c58fb 100644 (file)
--- a/src/pkg/crypto/tls/record_write.go
+++ b/src/pkg/crypto/tls/record_write.go
@@ -74,10 +74,16 @@ func (w *recordWriter) loop(writer io.Writer, appChan <-chan []byte, controlChan
        }
 
        if !closed(appChan) {
-               go func() { for _ = range appChan {} }();
+               go func() {
+                       for _ = range appChan {
+                       }
+               }();
        }
        if !closed(controlChan) {
-               go func() { for _ = range controlChan {} }();
+               go func() {
+                       for _ = range controlChan {
+                       }
+               }();
        }
 }