Implement 1-RTT Exporter. #130
Conversation
|
@bifurcation: I think this is ready but I'd like a review from @martinthomson first. |
| @@ -785,6 +800,7 @@ type ServerStateWaitFinished struct { | |||
| handshakeHash hash.Hash | |||
| clientTrafficSecret []byte | |||
| serverTrafficSecret []byte | |||
| exporterSecret []byte | |||
There was a problem hiding this comment.
The duplication here is starting to look pretty bad. Any reason why these state variables can't be bound up into a struct that can be reused? This is probably a question for @bifurcation who created this miss in the first place.
conn.go
Outdated
|
|
||
| func (c *Conn) ComputeExporter(label string, context []byte, keyLength int) ([]byte, error) { | ||
| _, ok := c.hState.(StateConnected) | ||
| if !ok { |
There was a problem hiding this comment.
s/ok/connected/, as above
There was a problem hiding this comment.
That said, if you want to factor out the early exporter, then checking that the appropriate secret is non-nil will achieve the same goal.
| @@ -729,3 +727,20 @@ func (c *Conn) SendKeyUpdate(requestUpdate bool) error { | |||
| func (c *Conn) GetHsState() string { | |||
| return reflect.TypeOf(c.hState).Name() | |||
| } | |||
|
|
|||
| func (c *Conn) ComputeExporter(label string, context []byte, keyLength int) ([]byte, error) { | |||
There was a problem hiding this comment.
Just to confirm: the plan is to add a ComputeEarlyExporter function for the early exporter and then to factor out the necessary parts of this function.
| @@ -729,3 +727,20 @@ func (c *Conn) SendKeyUpdate(requestUpdate bool) error { | |||
| func (c *Conn) GetHsState() string { | |||
| return reflect.TypeOf(c.hState).Name() | |||
| } | |||
|
|
|||
| func (c *Conn) ComputeExporter(label string, context []byte, keyLength int) ([]byte, error) { | |||
There was a problem hiding this comment.
I just learned something about go today. Apparently string is essentially the same as []byte. I don't know what to do about that though.
conn_test.go
Outdated
| @@ -274,6 +274,12 @@ func assertKeySetEquals(t *testing.T, k1, k2 keySet) { | |||
| assertByteEquals(t, k1.key, k2.key) | |||
| } | |||
|
|
|||
| func computeExporter(t *testing.T, c *Conn, label string, length int) []byte { | |||
| res, err := c.ComputeExporter(label, []byte{}, length) | |||
There was a problem hiding this comment.
The tests should exercise non-zero-length contexts.
There was a problem hiding this comment.
I didn't expose non-zero length contexts. Do you think we need them?
There was a problem hiding this comment.
Oh, never mind. Am idiot.
|
Replaced by #135 |
No description provided.