Fix AEAD buffer overlap bug

eudemon000 · Sep 27, 2018 · 1191fd9 · 1191fd9
1 parent c25b1d1
commit 1191fd9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/shadowaead/packet.go b/shadowaead/packet.go
@@ -87,6 +87,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
@@ -71,6 +71,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.Cipher)
-	return len(b), addr, err
+	bb, err := Unpack(b[c.IVSize():], b[:n], c.Cipher)
+	if err != nil {
+		return n, addr, err
+	}
+	copy(b, bb)
+	return len(bb), addr, err
 }