Merge pull request #109 from lixin9311/aead_packet_decryption_overlap…

…_fix Fix the overlap problem of udp decryption.
shadowsocks · Aug 29, 2018 · 8f3c47f · 8f3c47f
2 parents 18fc4a9 + 89e875b
commit 8f3c47f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/shadowaead/packet.go b/shadowaead/packet.go
@@ -88,6 +88,10 @@ func (c *packetConn) ReadFrom(b []byte) (int, net.Addr, error) {
 	if err != nil {
 		return n, addr, err
 	}
-	b, err = Unpack(b, b[:n], c)
-	return len(b), addr, err
+	bb, err := Unpack(b[c.Cipher.SaltSize():], b[:n], c)
+	if err != nil {
+		return n, addr, err
+	}
+	copy(b, bb)
+	return len(bb), addr, err
 }
diff --git a/shadowstream/packet.go b/shadowstream/packet.go
@@ -76,5 +76,5 @@ func (c *packetConn) ReadFrom(b []byte) (int, net.Addr, error) {
 		return n, addr, err
 	}
 	copy(b, bb)
-	return len(b), addr, err
+	return len(bb), addr, err
 }