Skip to content

Randomize in-place #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kyledj wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Randomize in-place #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b655ed
Randomize in place and change a name
Aug 27, 2013
2fe46f3
Merge branch 'master' into chaff-refactor
Aug 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions minnow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (mw *MessageWriteCloser) Close() error {
packets := make([]Packet, mw.numchaff + 1)
packets[0] = *p
for i := 1; i < mw.numchaff + 1; i++ {
packets[i] = makeFakeMessage(1, p.Header.SequenceN)
packets[i] = makeChaff(1, p.Header.SequenceN)
}

packets = randomizePackets(packets)
Expand Down Expand Up @@ -182,19 +182,17 @@ func sequentialPacketChannel(data []byte, hasher hash.Hash) chan *Packet {
return outchan
}

// Randomize a slice of packets in-place
func randomizePackets(packets []Packet) []Packet {
newpackets := make([]Packet, 0)

for len(packets) > 0 {
for i := 0; i < len(packets); i++ {
randndx := mathRand.Intn(len(packets))
newpackets = append(newpackets, packets[randndx])
packets = append(packets[:randndx], packets[randndx+1:]...)
packets[i], packets[randndx] = packets[randndx], packets[i]

@schmichael schmichael Aug 28, 2013

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}

return newpackets
return packets
}

func makeFakeMessage(size uint64, sequencenum uint64) Packet {
func makeChaff(size uint64, sequencenum uint64) Packet {
crypthash := make([]byte, 64)
hash := new([64]byte)
payloadbuf := make([]byte, size)
Expand Down