Merge branch 'aead-proposal'
authorMartin Willi <martin@revosec.ch>
Fri, 16 May 2014 14:54:04 +0000 (16:54 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 16 May 2014 14:54:04 +0000 (16:54 +0200)
commit2145f0c212d6e804125c615978fd22f3829e8839
tree075ee9108f9531f8431fa376262a5b29de46f277
parent9612db648aeb88d9bbc61f00940ebaa47ba1028d
parent2f893f278d5fe2bf43081bf5c341f9feaf3aedcb
Merge branch 'aead-proposal'

Encode default AEAD encryption algorithms to a proposal separate from non-AEAD
algorithms. RFC 4306 and 5282 where less explicit, but RFC 5996 requires
separate proposals for AEAD and non-AEAD algorithms. As responder we still
accept both encoding variants.

Fixes #573.