Fix xor

Author: ramnes

mysql/util.go

@@ -56,12 +56,11 @@ func CalcNativePassword(scramble, password []byte) []byte {
 	return Xor(scrambleHash, stage1)
 }
 
-// Xor returns a new slice with hash1 XOR hash2
+// Xor returns a new slice with hash1 XOR hash2, wrapping hash2 if hash1 is longer.
 func Xor(hash1 []byte, hash2 []byte) []byte {
-	l := min(len(hash1), len(hash2))
-	result := make([]byte, l)
-	for i := range l {
-		result[i] = hash1[i] ^ hash2[i]
+	result := make([]byte, len(hash1))
+	for i := range hash1 {
+		result[i] = hash1[i] ^ hash2[i%len(hash2)]
 	}
 	return result
 }