On 02/17/2014 05:01 PM, David Woodhouse wrote: > On Mon, 2014-02-17 at 14:32 +0100, Nikos Mavrogiannopoulos wrote: >>> You guys might want to hold off on "Rework DTLS master secret >>> (re)generation" depending on what Nikos' rekeying changes wind up looking like? >> >> I have completed the changes in the rekey branch. > > Ok, I've merged both of these as seemed appropriate. Please shout if > I've screwed it up. Thanks. On a second read, I think my changes conflict with: a1e3914fd0f469640a323da63715e8abf764a3a0 The latter sets the rekey method in TLS to be the same as the CSTP rekey method, while in 14d807f58d2ca82f60505ef92115258c2d26da3f I assumed that DTLS will have rekey method of NONE and will be reconnected at the CSTP rehandshake/reconnect. regards, Nikos