diff --git a/CHANGES b/CHANGES index 711a5ed22b..4087615fe2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.3-392 | 2015-01-15 09:44:15 -0800 + + * Small changes to EC curve names in a newer draft. (Johanna Amann) + 2.3-390 | 2015-01-14 13:27:34 -0800 * Updating MySQL analyses. (Vlad Grigorescu) diff --git a/VERSION b/VERSION index 455f1ce34e..1cb805162d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-390 +2.3-392 diff --git a/scripts/base/protocols/ssl/consts.bro b/scripts/base/protocols/ssl/consts.bro index 278a2a37ae..3d115419d4 100644 --- a/scripts/base/protocols/ssl/consts.bro +++ b/scripts/base/protocols/ssl/consts.bro @@ -158,12 +158,11 @@ export { [26] = "brainpoolP256r1", [27] = "brainpoolP384r1", [28] = "brainpoolP512r1", - # draft-ietf-tls-negotiated-ff-dhe-02 - [256] = "ffdhe2432", + # draft-ietf-tls-negotiated-ff-dhe-05 + [256] = "ffdhe2048", [257] = "ffdhe3072", [258] = "ffdhe4096", - [259] = "ffdhe6144", - [260] = "ffdhe8192", + [259] = "ffdhe8192", [0xFF01] = "arbitrary_explicit_prime_curves", [0xFF02] = "arbitrary_explicit_char2_curves" } &default=function(i: count):string { return fmt("unknown-%d", i); };