* clean up scanner comments

lib/pgp/packet/sigsubpacket/packet.rb

@@ -102,18 +102,24 @@ def self.load(port)
     packet
   end
 
-  def self.scan(port, io = STDOUT)
+  def self.scan(port, io)
     length = load_length_new(port)
     type = load_type(port)
     critical = (type & T_CRITICAL).nonzero?
     type &= ~T_CRITICAL
     critlabel = critical ? "Critical" : "Non-critical"
-    io.puts "#{critlabel} Sub: #{typelabel(type)}(#{type})(#{length - 1} bytes)\n"
-    if !TAG_SCANNER.key?(type) and critical
+    io.puts "#{critlabel} Sub: #{typelabel(type)}(#{type})(#{length - 1} bytes)"
+    if TAG_SCANNER.key?(type)
+      io.indent(4) do
+        TAG_SCANNER[type].call(io, port, length - 1)
+      end
+    elsif critical
       raise "Not supported: #{type}"
-    end
-    io.indent(4) do
-      TAG_SCANNER[type].call(io, port, length - 1)
+    else
+      io.indent(4) do
+        io.puts "(unknown sub packet)"
+      end
+      port.read(length - 1)
     end
   end
 

lib/pgp/packet/sigsubpacket/preferredcompressionalgorithm.rb

@@ -18,7 +18,7 @@ def initialize
   def scan(io)
     super
     @algorithm.each do |algo|
-      io.puts CompressionAlgorithm.label(algo)
+      io.puts "#{CompressionAlgorithm.label(algo)}(#{algo})"
     end
   end
 

lib/pgp/packet/sigsubpacket/preferredhashalgorithm.rb

@@ -18,7 +18,7 @@ def initialize
   def scan(io)
     super
     @algorithm.each do |algo|
-      io.puts HashAlgorithm.label(algo)
+      io.puts "#{HashAlgorithm.label(algo)}(#{algo})"
     end
   end
 

lib/pgp/packet/sigsubpacket/preferredskeyalgorithm.rb

@@ -18,7 +18,7 @@ def initialize
   def scan(io)
     super
     @algorithm.each do |algo|
-      io.puts SKeyAlgorithm.label(algo)
+      io.puts "#{SKeyAlgorithm.label(algo)}(#{algo})"
     end
   end