From 0e7d70e21924beb04cf0109e899c2b0003b55ffd Mon Sep 17 00:00:00 2001 From: Bernhard Amann Date: Fri, 21 Feb 2014 06:05:12 -0800 Subject: [PATCH 1/3] Correct return type of topk_get_top, addresses BIT-1144 --- src/probabilistic/top-k.bif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/probabilistic/top-k.bif b/src/probabilistic/top-k.bif index 5362750467..0589608d22 100644 --- a/src/probabilistic/top-k.bif +++ b/src/probabilistic/top-k.bif @@ -49,7 +49,7 @@ function topk_add%(handle: opaque of topk, value: any%): any ## ## .. bro:see:: topk_init topk_add topk_count topk_epsilon ## topk_size topk_sum topk_merge topk_merge_prune -function topk_get_top%(handle: opaque of topk, k: count%): any +function topk_get_top%(handle: opaque of topk, k: count%): index_vec %{ assert(handle); probabilistic::TopkVal* h = (probabilistic::TopkVal*) handle; From 81e561e5dea6a00c7d70058974964434450fe292 Mon Sep 17 00:00:00 2001 From: Bernhard Amann Date: Fri, 21 Feb 2014 11:18:35 -0800 Subject: [PATCH 2/3] Revert "Correct return type of topk_get_top, addresses BIT-1144" This reverts commit 0e7d70e21924beb04cf0109e899c2b0003b55ffd. Sorry, bad idea. --- src/probabilistic/top-k.bif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/probabilistic/top-k.bif b/src/probabilistic/top-k.bif index 0589608d22..5362750467 100644 --- a/src/probabilistic/top-k.bif +++ b/src/probabilistic/top-k.bif @@ -49,7 +49,7 @@ function topk_add%(handle: opaque of topk, value: any%): any ## ## .. bro:see:: topk_init topk_add topk_count topk_epsilon ## topk_size topk_sum topk_merge topk_merge_prune -function topk_get_top%(handle: opaque of topk, k: count%): index_vec +function topk_get_top%(handle: opaque of topk, k: count%): any %{ assert(handle); probabilistic::TopkVal* h = (probabilistic::TopkVal*) handle; From ca2cdd88615584e782564d334e703883f40f6abf Mon Sep 17 00:00:00 2001 From: Bernhard Amann Date: Fri, 21 Feb 2014 11:24:03 -0800 Subject: [PATCH 3/3] new TLS constants from https://tools.ietf.org/html/draft-bmoeller-tls-downgrade-scsv-01 --- scripts/base/protocols/ssl/consts.bro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/base/protocols/ssl/consts.bro b/scripts/base/protocols/ssl/consts.bro index c50ad13648..9e9222f12c 100644 --- a/scripts/base/protocols/ssl/consts.bro +++ b/scripts/base/protocols/ssl/consts.bro @@ -47,6 +47,7 @@ export { [70] = "protocol_version", [71] = "insufficient_security", [80] = "internal_error", + [86] = "inappropriate_fallback", [90] = "user_canceled", [100] = "no_renegotiation", [110] = "unsupported_extension", @@ -264,6 +265,8 @@ export { const TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C3; const TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C4; const TLS_DH_ANON_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C5; + # draft-bmoeller-tls-downgrade-scsv-01 + const TLS_FALLBACK_SCSV = 0x5600; # RFC 4492 const TLS_ECDH_ECDSA_WITH_NULL_SHA = 0xC001; const TLS_ECDH_ECDSA_WITH_RC4_128_SHA = 0xC002; @@ -630,6 +633,7 @@ export { [TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256] = "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256", [TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256] = "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256", [TLS_DH_ANON_WITH_CAMELLIA_256_CBC_SHA256] = "TLS_DH_ANON_WITH_CAMELLIA_256_CBC_SHA256", + [TLS_FALLBACK_SCSV] = "TLS_FALLBACK_SCSV", [TLS_ECDH_ECDSA_WITH_NULL_SHA] = "TLS_ECDH_ECDSA_WITH_NULL_SHA", [TLS_ECDH_ECDSA_WITH_RC4_128_SHA] = "TLS_ECDH_ECDSA_WITH_RC4_128_SHA", [TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA] = "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",