Fix all go vet issues

merge-requests/3/head
Daniel Martí 9 years ago
parent 08647ec580
commit 19dcb424be

@ -235,7 +235,7 @@ func (conn *obfs2Conn) handshake() (err error) {
return
}
txStream := cipher.NewCTR(txBlock, padIV)
conn.tx = &cipher.StreamWriter{txStream, conn.Conn, nil}
conn.tx = &cipher.StreamWriter{S: txStream, W: conn.Conn}
if _, err = conn.Conn.Write(seed[:]); err != nil {
return
}
@ -262,7 +262,7 @@ func (conn *obfs2Conn) handshake() (err error) {
return
}
rxStream := cipher.NewCTR(rxBlock, peerIV)
conn.rx = &cipher.StreamReader{rxStream, conn.Conn}
conn.rx = &cipher.StreamReader{S: rxStream, R: conn.Conn}
hsHdr := make([]byte, hsLen)
if _, err = io.ReadFull(conn, hsHdr[:]); err != nil {
return

@ -261,13 +261,13 @@ func (conn *obfs3Conn) kdf(sharedSecret []byte) (err error) {
respStream := cipher.NewCTR(respBlock, respSecret[keyLen:])
if conn.isInitiator {
conn.tx = &cipher.StreamWriter{initStream, conn.Conn, nil}
conn.rx = &cipher.StreamReader{respStream, conn.rxBuf}
conn.tx = &cipher.StreamWriter{S: initStream, W: conn.Conn}
conn.rx = &cipher.StreamReader{S: respStream, R: conn.rxBuf}
conn.txMagic = initMagic
conn.rxMagic = respMagic
} else {
conn.tx = &cipher.StreamWriter{respStream, conn.Conn, nil}
conn.rx = &cipher.StreamReader{initStream, conn.rxBuf}
conn.tx = &cipher.StreamWriter{S: respStream, W: conn.Conn}
conn.rx = &cipher.StreamReader{S: initStream, R: conn.rxBuf}
conn.txMagic = respMagic
conn.rxMagic = initMagic
}

Loading…
Cancel
Save