kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

runner: Move Finished special-case into dtlsWriteRecord.

Browse Source 
We actually don't really care about this special-case since we only test client
full handshakes where the runner sends the second Finished not the shim
(otherwise the overlap logic and retransmitting on every fragment would
probably break us), but it should probably live next to the fragmentation
logic.

Change-Id: I54097d84ad8294bc6c42a84d6f22f496e63eb2a8
Reviewed-on: https://boringssl-review.googlesource.com/3763
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-03-02 19:10:53 -05:00 committed by Adam Langley
parent 7eaab4cd57
commit a4e6d48749
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ssl/test/runner/dtls.go
View File

@ -129,6 +129,8 @@ func (c *Conn) dtlsWriteRecord(typ recordType, data []byte) (n int, err error) {
header := data[:4]
data = data[4:]
isFinished := header[0] == typeFinished
firstRun := true
for firstRun || len(data) > 0 {
firstRun = false
@ -151,10 +153,17 @@ func (c *Conn) dtlsWriteRecord(typ recordType, data []byte) (n int, err error) {
// Buffer the fragment for later. They will be sent (and
// reordered) on flush.
c.pendingFragments = append(c.pendingFragments, fragment)
if c.config.Bugs.ReorderHandshakeFragments {
// Don't duplicate Finished to avoid the peer
// interpreting it as a retransmit request.
if !isFinished {
c.pendingFragments = append(c.pendingFragments, fragment)
}
if c.config.Bugs.ReorderHandshakeFragments && m > (maxLen+1)/2 {
// Overlap each fragment by half.
m = (maxLen + 1) / 2
if m > (maxLen+1)/2 {
// Overlap each fragment by half.
m = (maxLen + 1) / 2
}
}
n += m
data = data[m:]
@ -166,7 +175,7 @@ func (c *Conn) dtlsWriteRecord(typ recordType, data []byte) (n int, err error) {
return
}
func (c *Conn) dtlsFlushHandshake(duplicate bool) error {
func (c *Conn) dtlsFlushHandshake() error {
if !c.isDTLS {
return nil
}
@ -175,9 +184,6 @@ func (c *Conn) dtlsFlushHandshake(duplicate bool) error {
fragments, c.pendingFragments = c.pendingFragments, fragments
if c.config.Bugs.ReorderHandshakeFragments {
if duplicate {
fragments = append(fragments, fragments...)
}
perm := rand.New(rand.NewSource(0)).Perm(len(fragments))
tmp := make([][]byte, len(fragments))
for i := range tmp {

12
ssl/test/runner/handshake_client.go
View File

@ -214,7 +214,7 @@ NextCipherSuite:
helloBytes = hello.marshal()
c.writeRecord(recordTypeHandshake, helloBytes)
}
c.dtlsFlushHandshake(true)
c.dtlsFlushHandshake()
if err := c.simulatePacketLoss(nil); err != nil {
return err
@ -238,7 +238,7 @@ NextCipherSuite:
hello.cookie = helloVerifyRequest.cookie
helloBytes = hello.marshal()
c.writeRecord(recordTypeHandshake, helloBytes)
c.dtlsFlushHandshake(true)
c.dtlsFlushHandshake()
if err := c.simulatePacketLoss(nil); err != nil {
return err
@ -331,7 +331,7 @@ NextCipherSuite:
// Finished.
if err := c.simulatePacketLoss(func() {
c.writeRecord(recordTypeHandshake, hs.finishedBytes)
c.dtlsFlushHandshake(false)
c.dtlsFlushHandshake()
}); err != nil {
return err
}
@ -617,7 +617,7 @@ func (hs *clientHandshakeState) doFullHandshake() error {
hs.writeClientHash(certVerify.marshal())
c.writeRecord(recordTypeHandshake, certVerify.marshal())
}
c.dtlsFlushHandshake(true)
c.dtlsFlushHandshake()
hs.finishedHash.discardHandshakeBuffer()
@ -853,7 +853,7 @@ func (hs *clientHandshakeState) sendFinished(isResume bool) error {
c.writeRecord(recordTypeHandshake, postCCSBytes[:5])
postCCSBytes = postCCSBytes[5:]
}
c.dtlsFlushHandshake(true)
c.dtlsFlushHandshake()
if !c.config.Bugs.SkipChangeCipherSpec &&
c.config.Bugs.EarlyChangeCipherSpec == 0 {
@ -866,7 +866,7 @@ func (hs *clientHandshakeState) sendFinished(isResume bool) error {
if !c.config.Bugs.SkipFinished {
c.writeRecord(recordTypeHandshake, postCCSBytes)
c.dtlsFlushHandshake(false)
c.dtlsFlushHandshake()
}
return nil
}

10
ssl/test/runner/handshake_server.go
View File

@ -77,7 +77,7 @@ func (c *Conn) serverHandshake() error {
// Finished.
if err := c.simulatePacketLoss(func() {
c.writeRecord(recordTypeHandshake, hs.finishedBytes)
c.dtlsFlushHandshake(false)
c.dtlsFlushHandshake()
}); err != nil {
return err
}
@ -149,7 +149,7 @@ func (hs *serverHandshakeState) readClientHello() (isResume bool, err error) {
return false, errors.New("dtls: short read from Rand: " + err.Error())
}
c.writeRecord(recordTypeHandshake, helloVerifyRequest.marshal())
c.dtlsFlushHandshake(true)
c.dtlsFlushHandshake()
if err := c.simulatePacketLoss(nil); err != nil {
return false, err
@ -551,7 +551,7 @@ func (hs *serverHandshakeState) doFullHandshake() error {
helloDone := new(serverHelloDoneMsg)
hs.writeServerHash(helloDone.marshal())
c.writeRecord(recordTypeHandshake, helloDone.marshal())
c.dtlsFlushHandshake(true)
c.dtlsFlushHandshake()
var pub crypto.PublicKey // public key for client auth, if any
@ -845,7 +845,7 @@ func (hs *serverHandshakeState) sendFinished() error {
c.writeRecord(recordTypeHandshake, postCCSBytes[:5])
postCCSBytes = postCCSBytes[5:]
}
c.dtlsFlushHandshake(true)
c.dtlsFlushHandshake()
if !c.config.Bugs.SkipChangeCipherSpec {
c.writeRecord(recordTypeChangeCipherSpec, []byte{1})
@ -857,7 +857,7 @@ func (hs *serverHandshakeState) sendFinished() error {
if !c.config.Bugs.SkipFinished {
c.writeRecord(recordTypeHandshake, postCCSBytes)
c.dtlsFlushHandshake(false)
c.dtlsFlushHandshake()
}
c.cipherSuite = hs.suite.id