pstream 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee81e7ea543491338bb800254b0b2cc4c0850c3
-  data.tar.gz: d877d6ff3c9deca5cc7b3ef7e07531e9e1f587de
+  metadata.gz: 9b5ec9929e9bd48fecc32ce9e9f5ce1703675390
+  data.tar.gz: 95bf28528095b9f9df126d69777411e3f0687a56
 SHA512:
-  metadata.gz: f65be907ced9b779793e85607d5b0e7a80306d8527dd7981890c0585da482cd4ab35a2de2ede23aa53b5c73b3ed224ec02e20aa76bc6c6a7f4a5a42d23ee5447
-  data.tar.gz: 6cace69f3b2e5eaa02ffc81dffb7a90bda72cd9dfe6413547f532f4ed289916fa2ca92558853679a9e442e2858300963e456e7e75eb7e628f351641174f0cdca
+  metadata.gz: f2fda90d6e63ab41c12c92a6e7f602c5cce20cb335334c09db4d179affeb6d23ba98c94aa742bf32089005ff95284d4eced38b3bfff8036004d1bcda42376975
+  data.tar.gz: ffe879ba24f2b9baec9e6d69b7fe5fc3067986fc0a13cbbc1543fe1aa6845f9c3c1cf065f7d91ed2d990b458c8161acec593b3848f0db5a16361190cf0d0a4ad

data/lib/pstream.rb

@@ -6,16 +6,14 @@ class PStream
 
     def cipher_negotiations
         negotiations = Hash.new
+        negotiation = nil
+        hello = nil
 
         # List ciphers during ssl handshake
-        out = %x(
+        %x(
             tshark -r #{@pcap} -Y ssl.handshake.ciphersuite -V 2>&1 \
                 | \grep -E "(Handshake|Internet) Prot|Cipher Suite"
-        )
-
-        negotiation = nil
-        hello = nil
-        out.split("\n").each do |line|
+        ).split("\n").each do |line|
             case line.gsub(/^ +/, "")
             when /^Cipher Suite:/
                 m = line.match(/Cipher Suite: ([^ ]+) (.*)$/)
@@ -154,13 +152,11 @@ class PStream
 
         streams = Array.new
 
-        out = %x(
+        count = 0
+        %x(
             tshark -r #{@pcap} -z conv,#{prot} 2>&1 | \grep -E "<->" \
                 | awk '{print $1, $2, $3, "|", $8, "Frames"}'
-        )
-
-        count = 0
-        out.split("\n").each do |line|
+        ).split("\n").each do |line|
             desc, frames = line.split(" | ")
             streams.push(
                 Stream.new(
@@ -205,7 +201,7 @@ class PStream
 
         # List streams
         ["tcp", "udp"].each do |prot|
-            ret.push(colorize_header("#{prot} streams:"))
+            ret.push(colorize_header("#{prot.upcase} streams:"))
             @streams[prot].each do |stream|
                 ret.push(colorize_stream(stream))
             end
@@ -214,8 +210,10 @@ class PStream
 
         # List ciphers that were actually selected
         ret.push(colorize_header("Ciphers in use:"))
-        cipher_negotiations.each do |negotiation|
-            ret.push(colorize_cipher_suite(negotiation.suite))
+        cipher_negotiations.map do |negotiation|
+            negotiation.suite
+        end.uniq.each do |suite|
+            ret.push(colorize_cipher_suite(suite))
         end
 
         return ret.join("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pstream
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Miles Whittaker