[GIT PULL V2] Fixes for rekeying, Android builds, etc.

[Nikos Mavrogiannopoulos]

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.

They look ok. It would be nice if someone could test the cases 1a, and
1b from the previous e-mail against an ASA server that supports them.

regards,
Nikos