mirror of
https://gitlab.com/yawning/obfs4.git
synced 2024-11-17 09:25:36 +00:00
5bdc376e2a
Instead of using the nonce for the secret box, just use SipHash-2-4 in OFB mode instead. The IV is generated as part of the KDF. This simplifies the code a decent amount and also is better on the off chance that SipHash-2-4 does not avalanche as well as it is currently assumed. While here, also decouple the fact that *this implementation* of obfs4 uses a PRNG with 24 bytes of internal state for protocol polymorphism instead of 32 bytes (that the spec requires). THIS CHANGE BREAKS WIRE PROTCOL COMPATIBILITY.
213 lines
5.8 KiB
Go
213 lines
5.8 KiB
Go
/*
|
|
* Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
*
|
|
* * Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
package obfs4
|
|
|
|
import (
|
|
"crypto/sha256"
|
|
"encoding/binary"
|
|
"fmt"
|
|
"io"
|
|
"syscall"
|
|
|
|
"github.com/yawning/obfs4/drbg"
|
|
"github.com/yawning/obfs4/framing"
|
|
)
|
|
|
|
const (
|
|
packetOverhead = 2 + 1
|
|
maxPacketPayloadLength = framing.MaximumFramePayloadLength - packetOverhead
|
|
maxPacketPaddingLength = maxPacketPayloadLength
|
|
seedPacketPayloadLength = SeedLength
|
|
|
|
consumeReadSize = framing.MaximumSegmentLength * 16
|
|
)
|
|
|
|
const (
|
|
packetTypePayload = iota
|
|
packetTypePrngSeed
|
|
)
|
|
|
|
// InvalidPacketLengthError is the error returned when decodePacket detects a
|
|
// invalid packet length/
|
|
type InvalidPacketLengthError int
|
|
|
|
func (e InvalidPacketLengthError) Error() string {
|
|
return fmt.Sprintf("packet: Invalid packet length: %d", int(e))
|
|
}
|
|
|
|
// InvalidPayloadLengthError is the error returned when decodePacket rejects the
|
|
// payload length.
|
|
type InvalidPayloadLengthError int
|
|
|
|
func (e InvalidPayloadLengthError) Error() string {
|
|
return fmt.Sprintf("packet: Invalid payload length: %d", int(e))
|
|
}
|
|
|
|
var zeroPadBytes [maxPacketPaddingLength]byte
|
|
|
|
func (c *Obfs4Conn) producePacket(w io.Writer, pktType uint8, data []byte, padLen uint16) (err error) {
|
|
var pkt [framing.MaximumFramePayloadLength]byte
|
|
|
|
if !c.CanReadWrite() {
|
|
return syscall.EINVAL
|
|
}
|
|
|
|
if len(data)+int(padLen) > maxPacketPayloadLength {
|
|
panic(fmt.Sprintf("BUG: makePacket() len(data) + padLen > maxPacketPayloadLength: %d + %d > %d",
|
|
len(data), padLen, maxPacketPayloadLength))
|
|
}
|
|
|
|
defer func() {
|
|
if err != nil {
|
|
c.setBroken()
|
|
}
|
|
}()
|
|
|
|
// Packets are:
|
|
// uint8_t type packetTypePayload (0x00)
|
|
// uint16_t length Length of the payload (Big Endian).
|
|
// uint8_t[] payload Data payload.
|
|
// uint8_t[] padding Padding.
|
|
pkt[0] = pktType
|
|
binary.BigEndian.PutUint16(pkt[1:], uint16(len(data)))
|
|
if len(data) > 0 {
|
|
copy(pkt[3:], data[:])
|
|
}
|
|
copy(pkt[3+len(data):], zeroPadBytes[:padLen])
|
|
|
|
pktLen := packetOverhead + len(data) + int(padLen)
|
|
|
|
// Encode the packet in an AEAD frame.
|
|
var frame [framing.MaximumSegmentLength]byte
|
|
frameLen := 0
|
|
frameLen, err = c.encoder.Encode(frame[:], pkt[:pktLen])
|
|
if err != nil {
|
|
// All encoder errors are fatal.
|
|
return
|
|
}
|
|
var wrLen int
|
|
wrLen, err = w.Write(frame[:frameLen])
|
|
if err != nil {
|
|
return
|
|
} else if wrLen < frameLen {
|
|
err = io.ErrShortWrite
|
|
return
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (c *Obfs4Conn) consumeFramedPackets(w io.Writer) (n int, err error) {
|
|
if !c.CanReadWrite() {
|
|
return n, syscall.EINVAL
|
|
}
|
|
|
|
var buf [consumeReadSize]byte
|
|
rdLen, rdErr := c.conn.Read(buf[:])
|
|
c.receiveBuffer.Write(buf[:rdLen])
|
|
var decoded [framing.MaximumFramePayloadLength]byte
|
|
for c.receiveBuffer.Len() > 0 {
|
|
// Decrypt an AEAD frame.
|
|
decLen := 0
|
|
decLen, err = c.decoder.Decode(decoded[:], &c.receiveBuffer)
|
|
if err == framing.ErrAgain {
|
|
break
|
|
} else if err != nil {
|
|
break
|
|
} else if decLen < packetOverhead {
|
|
err = InvalidPacketLengthError(decLen)
|
|
break
|
|
}
|
|
|
|
// Decode the packet.
|
|
pkt := decoded[0:decLen]
|
|
pktType := pkt[0]
|
|
payloadLen := binary.BigEndian.Uint16(pkt[1:])
|
|
if int(payloadLen) > len(pkt)-packetOverhead {
|
|
err = InvalidPayloadLengthError(int(payloadLen))
|
|
break
|
|
}
|
|
payload := pkt[3 : 3+payloadLen]
|
|
|
|
switch pktType {
|
|
case packetTypePayload:
|
|
if payloadLen > 0 {
|
|
if w != nil {
|
|
// c.WriteTo() skips buffering in c.receiveDecodedBuffer
|
|
var wrLen int
|
|
wrLen, err = w.Write(payload)
|
|
n += wrLen
|
|
if err != nil {
|
|
break
|
|
} else if wrLen < int(payloadLen) {
|
|
err = io.ErrShortWrite
|
|
break
|
|
}
|
|
} else {
|
|
// c.Read() stashes decoded payload in receiveDecodedBuffer
|
|
c.receiveDecodedBuffer.Write(payload)
|
|
n += int(payloadLen)
|
|
}
|
|
}
|
|
case packetTypePrngSeed:
|
|
// Only regenerate the distribution if we are the client.
|
|
if len(payload) == seedPacketPayloadLength && !c.isServer {
|
|
var seed *drbg.Seed
|
|
seed, err = drbg.SeedFromBytes(payload)
|
|
if err != nil {
|
|
break
|
|
}
|
|
c.lenProbDist.reset(seed)
|
|
if c.iatProbDist != nil {
|
|
iatSeedSrc := sha256.Sum256(seed.Bytes()[:])
|
|
iatSeed, err := drbg.SeedFromBytes(iatSeedSrc[:])
|
|
if err != nil {
|
|
break
|
|
}
|
|
c.iatProbDist.reset(iatSeed)
|
|
}
|
|
}
|
|
default:
|
|
// Ignore unrecognised packet types.
|
|
}
|
|
}
|
|
|
|
// Read errors and non-framing.ErrAgain errors are all fatal.
|
|
if (err != nil && err != framing.ErrAgain) || rdErr != nil {
|
|
// Propagate read errors correctly.
|
|
if err == nil && rdErr != nil {
|
|
err = rdErr
|
|
}
|
|
c.setBroken()
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
/* vim :set ts=4 sw=4 sts=4 noet : */
|