-
-
Notifications
You must be signed in to change notification settings - Fork 267
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor and compile masking code again
- Loading branch information
Showing
8 changed files
with
139 additions
and
137 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= | ||
| golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||
| golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= | ||
| golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| //go:build !amd64 && !arm64 && !js | ||
|
|
||
| package websocket | ||
|
|
||
| import ( | ||
| "encoding/binary" | ||
| "math/bits" | ||
| ) | ||
|
|
||
| // mask applies the WebSocket masking algorithm to p | ||
| // with the given key. | ||
| // See https://tools.ietf.org/html/rfc6455#section-5.3 | ||
| // | ||
| // The returned value is the correctly rotated key to | ||
| // to continue to mask/unmask the message. | ||
| // | ||
| // It is optimized for LittleEndian and expects the key | ||
| // to be in little endian. | ||
| // | ||
| // See https://github.com/golang/go/issues/31586 | ||
| func mask(key uint32, b []byte) uint32 { | ||
| if len(b) >= 8 { | ||
| key64 := uint64(key)<<32 | uint64(key) | ||
|
|
||
| // At some point in the future we can clean these unrolled loops up. | ||
| // See https://github.com/golang/go/issues/31586#issuecomment-487436401 | ||
|
|
||
| // Then we xor until b is less than 128 bytes. | ||
| for len(b) >= 128 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[16:24]) | ||
| binary.LittleEndian.PutUint64(b[16:24], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[24:32]) | ||
| binary.LittleEndian.PutUint64(b[24:32], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[32:40]) | ||
| binary.LittleEndian.PutUint64(b[32:40], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[40:48]) | ||
| binary.LittleEndian.PutUint64(b[40:48], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[48:56]) | ||
| binary.LittleEndian.PutUint64(b[48:56], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[56:64]) | ||
| binary.LittleEndian.PutUint64(b[56:64], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[64:72]) | ||
| binary.LittleEndian.PutUint64(b[64:72], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[72:80]) | ||
| binary.LittleEndian.PutUint64(b[72:80], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[80:88]) | ||
| binary.LittleEndian.PutUint64(b[80:88], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[88:96]) | ||
| binary.LittleEndian.PutUint64(b[88:96], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[96:104]) | ||
| binary.LittleEndian.PutUint64(b[96:104], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[104:112]) | ||
| binary.LittleEndian.PutUint64(b[104:112], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[112:120]) | ||
| binary.LittleEndian.PutUint64(b[112:120], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[120:128]) | ||
| binary.LittleEndian.PutUint64(b[120:128], v^key64) | ||
| b = b[128:] | ||
| } | ||
|
|
||
| // Then we xor until b is less than 64 bytes. | ||
| for len(b) >= 64 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[16:24]) | ||
| binary.LittleEndian.PutUint64(b[16:24], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[24:32]) | ||
| binary.LittleEndian.PutUint64(b[24:32], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[32:40]) | ||
| binary.LittleEndian.PutUint64(b[32:40], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[40:48]) | ||
| binary.LittleEndian.PutUint64(b[40:48], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[48:56]) | ||
| binary.LittleEndian.PutUint64(b[48:56], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[56:64]) | ||
| binary.LittleEndian.PutUint64(b[56:64], v^key64) | ||
| b = b[64:] | ||
| } | ||
|
|
||
| // Then we xor until b is less than 32 bytes. | ||
| for len(b) >= 32 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[16:24]) | ||
| binary.LittleEndian.PutUint64(b[16:24], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[24:32]) | ||
| binary.LittleEndian.PutUint64(b[24:32], v^key64) | ||
| b = b[32:] | ||
| } | ||
|
|
||
| // Then we xor until b is less than 16 bytes. | ||
| for len(b) >= 16 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| b = b[16:] | ||
| } | ||
|
|
||
| // Then we xor until b is less than 8 bytes. | ||
| for len(b) >= 8 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| b = b[8:] | ||
| } | ||
| } | ||
|
|
||
| // Then we xor until b is less than 4 bytes. | ||
| for len(b) >= 4 { | ||
| v := binary.LittleEndian.Uint32(b) | ||
| binary.LittleEndian.PutUint32(b, v^key) | ||
| b = b[4:] | ||
| } | ||
|
|
||
| // xor remaining bytes. | ||
| for i := range b { | ||
| b[i] ^= byte(key) | ||
| key = bits.RotateLeft32(key, -8) | ||
| } | ||
|
|
||
| return key | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.