diff --git a/lib/cryptcheck/tls.rb b/lib/cryptcheck/tls.rb index 68c215d..3751221 100644 --- a/lib/cryptcheck/tls.rb +++ b/lib/cryptcheck/tls.rb @@ -9,19 +9,24 @@ module CryptCheck def self.colorize(cipher) colors = case - when /^SSL/ =~ cipher then :critical - when :TLSv1_2 == cipher then :good + when /^SSL/ =~ cipher + :critical + when :TLSv1_2 == cipher + :good end cipher.to_s.colorize colors end def self.key_to_s(key) - type_color = case key.type - when :ecc then :good - when :dh then :warning - when :dsa then :critical + size, color = case key.type + when :ecc + ["#{key.group.curve_name} #{key.size}", :good] + when :dh + [key.size, :warning] + when :dsa + [key.size, :critical] end - "#{key.type.to_s.upcase.colorize type_color} #{key.size.to_s.colorize key.status} bits" + "#{key.type.to_s.upcase.colorize color} #{size.to_s.colorize key.status} bits" end end end