Skip to content
Snippets Groups Projects
Commit 19dcb424 authored by Daniel Martí's avatar Daniel Martí
Browse files

Fix all go vet issues

parent 08647ec5
No related branches found
No related tags found
No related merge requests found
......@@ -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
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment