mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-07 06:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

pass received diversification nonces to the CryptoSetup

Browse source
This commit is contained in:
Marten Seemann 2016-11-09 19:01:51 +07:00
parent 5e0ded9850
commit f44612cc2f
No known key found for this signature in database
GPG key ID: 3603F40B121FCDEA
2 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
session.go
View file

@ -286,6 +286,13 @@ func (s *Session) idleTimeout() time.Duration {
}
func (s *Session) handlePacketImpl(p *receivedPacket) error {
if s.perspective == protocol.PerspectiveClient {
diversificationNonce := p.publicHeader.DiversificationNonce
if len(diversificationNonce) > 0 {
s.cryptoSetup.SetDiversificationNonce(diversificationNonce)
}
}
if p.rcvTime.IsZero() {
// To simplify testing
p.rcvTime = time.Now()

22
session_test.go
View file

@ -117,6 +117,7 @@ var _ ackhandler.ReceivedPacketHandler = &mockReceivedPacketHandler{}
var _ = Describe("Session", func() {
var (
session *Session
clientSession *Session
streamCallbackCalled bool
closeCallbackCalled bool
conn *mockConnection
@ -148,6 +149,18 @@ var _ = Describe("Session", func() {
cpm = &mockConnectionParametersManager{idleTime: 60 * time.Second}
session.connectionParameters = cpm
clientSession, err = newClientSession(
&net.UDPConn{},
&net.UDPAddr{},
protocol.Version35,
0,
func(*Session, utils.Stream) { streamCallbackCalled = true },
func(protocol.ConnectionID) { closeCallbackCalled = true },
)
Expect(err).ToNot(HaveOccurred())
Expect(clientSession.streamsMap.openStreams).To(HaveLen(1))
})
Context("when handling stream frames", func() {
@ -584,6 +597,7 @@ var _ = Describe("Session", func() {
BeforeEach(func() {
session.unpacker = &mockUnpacker{}
clientSession.unpacker = &mockUnpacker{}
hdr = &PublicHeader{PacketNumberLen: protocol.PacketNumberLen6}
})
@ -624,6 +638,14 @@ var _ = Describe("Session", func() {
Expect(err).ToNot(HaveOccurred())
})
It("passes the diversification nonce to the cryptoSetup, if it is a client", func() {
hdr.PacketNumber = 5
hdr.DiversificationNonce = []byte("foobar")
err := clientSession.handlePacketImpl(&receivedPacket{publicHeader: hdr})
Expect(err).ToNot(HaveOccurred())
Expect((*[]byte)(unsafe.Pointer(reflect.ValueOf(clientSession.cryptoSetup).Elem().FieldByName("diversificationNonce").UnsafeAddr()))).To(Equal(&hdr.DiversificationNonce))
})
Context("updating the remote address", func() {
It("sets the remote address", func() {
remoteIP := net.IPv4(192, 168, 0, 100)