fix some style things for egypt

Author: David Maloney

lib/rex/sslscan/result.rb

@@ -12,7 +12,7 @@ class Result
 
 	def initialize()
 		@cert = nil
-		@ciphers = []
+		@ciphers = Set.new
 		@supported_versions = [:SSLv2, :SSLv3, :TLSv1]
 	end
 
@@ -53,7 +53,8 @@ def strong_ciphers
 	# @raise [ArgumentError] if the version supplied is invalid
 	# @return [Array] An array of accepted cipher details matching the supplied versions
 	def accepted(version = :all)
-		if version.kind_of? Symbol
+    case version
+		when Symbol
 			case version
 			when :all
 				return @ciphers.reject{|cipher| cipher[:status] == :rejected}
@@ -62,8 +63,8 @@ def accepted(version = :all)
 			else
 				raise ArgumentError, "Invalid SSL Version Supplied: #{version}"
 			end
-		elsif version.kind_of? Array 
-			version.reject!{|v| !(@supported_versions.include? v)}
+		when Array
+			version = version.reject{|v| !(@supported_versions.include? v)}
 			if version.empty?
 				return @ciphers.reject{|cipher| cipher[:status] == :rejected}
 			else
@@ -80,7 +81,8 @@ def accepted(version = :all)
 	# @raise [ArgumentError] if the version supplied is invalid
 	# @return [Array] An array of rejected cipher details matching the supplied versions
 	def rejected(version = :all)
-		if version.kind_of? Symbol
+    case version
+		when Symbol
 			case version
 			when :all
 				return @ciphers.reject{|cipher| cipher[:status] == :accepted}
@@ -89,8 +91,8 @@ def rejected(version = :all)
 			else
 				raise ArgumentError, "Invalid SSL Version Supplied: #{version}"
 			end
-		elsif version.kind_of? Array 
-			version.reject!{|v| !(@supported_versions.include? v)}
+		when Array
+			version = version.reject{|v| !(@supported_versions.include? v)}
 			if version.empty?
 				return @ciphers.reject{|cipher| cipher[:status] == :accepted}
 			else
@@ -173,7 +175,6 @@ def add_cipher(version, cipher, key_length, status)
 
 		cipher_details = {:version => version, :cipher => cipher, :key_length => key_length, :weak => weak, :status => status}
 		@ciphers << cipher_details
-		@ciphers.uniq!
 	end
 
 	def to_s

spec/lib/rex/sslscan/result_spec.rb

@@ -25,8 +25,8 @@
 			subject.cert.should == nil
 		end
 
-		it "should return an empty array for ciphers" do
-			subject.ciphers.should == []
+		it "should return an empty set for ciphers" do
+			subject.ciphers.empty?.should == true
 		end
 
 		it "should return an empty array for accepted" do