yawast 0.5.0.beta4 → 0.5.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 400253733c35a69633bfa93c996cd7eb2fed21b5
-  data.tar.gz: 453abac414cc6af0f4efb1b952189a1457887e33
+  metadata.gz: 02aa0ad73bc9e34325a0989a0e9c30a28fe2e40a
+  data.tar.gz: 0391495210e5beeff8306ad8173730f707a4a607
 SHA512:
-  metadata.gz: 899b87c5677b6fbf4bcd6fde0d6249064a0844c11a4a53f7567da47cb08aec289dcdaa7ca525a544cced1249b7c7e584a4c0f632e716351a1c364d6489bc0626
-  data.tar.gz: 83b67f387e7364708c1b49f7f6c7d900466f6e438ae6b14ae5a223d57dcb737f6874dd9e16c1183cc60958a43fa20dbc6689b4549c75b23634c21d116c1f2b6a
+  metadata.gz: 32d58a74c90bab8977d103fb40a5dce202e2dd80c9a3d7bb9fb01b197944dcc9894fb8d6a2a3273952cb6398c1ab1ff8dbeb7fe167909cb6a65bb0bc3fac2903
+  data.tar.gz: 3fc7dad7e9bab7552f97f127aba85b468372f5fce27ed916db6f504b0b21d43b39ade769c547525d3fad5b8da8e768a247d59c7da757c9b627766fd4c42fbd57

data/CHANGELOG.md

@@ -11,6 +11,7 @@
 * [#91](https://github.com/adamcaudill/yawast/issues/91) - Enhanced file search
 * [#96](https://github.com/adamcaudill/yawast/issues/96) - Scan for known SRV DNS Records
 * [#97](https://github.com/adamcaudill/yawast/issues/97) - Search for Common Subdomains
+* [#102](https://github.com/adamcaudill/yawast/issues/102) - Use SSLShake to power cipher suite enumeration
 * [#76](https://github.com/adamcaudill/yawast/issues/76) - Bug: Handle error for OpenSSL version support error
 * [#98](https://github.com/adamcaudill/yawast/issues/98) - Bug: SWEET32 Test Fails if 3DES Not Support By Latest Server Supported TLS Version
 * [#99](https://github.com/adamcaudill/yawast/issues/99) - Bug: Cloudflare SWEET32 False Positive

data/lib/scanner/ssl.rb

@@ -1,6 +1,7 @@
 require 'openssl'
 require 'openssl-extensions/all'
 require 'digest/sha1'
+require 'sslshake'
 
 module Yawast
   module Scanner
@@ -119,7 +120,7 @@ module Yawast
       end
 
       def self.get_ciphers(uri)
-        puts 'Supported Ciphers (based on your OpenSSL version):'
+        puts 'Supported Ciphers:'
 
         dns = Resolv::DNS.new
 
@@ -129,27 +130,29 @@ module Yawast
           ip = dns.getaddresses(uri.host)[0]
         end
 
-        #find all versions that don't include '_server' or '_client'
-        versions = OpenSSL::SSL::SSLContext::METHODS.find_all { |v| !v.to_s.include?('_client') && !v.to_s.include?('_server')}
+        protocols = %w(ssl2 ssl3 tls1.0 tls1.1 tls1.2)
 
-        versions.each do |version|
-          #ignore SSLv23, as it's an auto-negotiate, which just adds noise
-          if version.to_s != 'SSLv23'
-            #try to get the list of ciphers supported for each version
-            ciphers = nil
+        protocols.each do |protocol|
+          case protocol
+            when 'ssl2'
+              ciphers = SSLShake::SSLv2::CIPHERS
+            when 'ssl3'
+              ciphers = SSLShake::TLS::SSL3_CIPHERS
+            else
+              ciphers = SSLShake::TLS::TLS_CIPHERS
+          end
+
+          puts "\tChecking for #{protocol} suites (#{ciphers.count} possible suites)"
 
-            get_ciphers_failed = false
+          ciphers.each_key do |cipher|
             begin
-              ciphers = OpenSSL::SSL::SSLContext.new(version).ciphers
-            rescue => e
-              Yawast::Utilities.puts_error "\tError getting cipher suites for #{version}, skipping. (#{e.message})"
-              get_ciphers_failed = true
-            end
+              res = SSLShake.hello(ip.to_s, port: uri.port, protocol: protocol, ciphers: cipher, servername: uri.host)
 
-            if ciphers != nil
-              check_version_suites uri, ip, ciphers, version
-            elsif !get_ciphers_failed
-              Yawast::Utilities.puts_info "\t#{version}: No cipher suites available."
+              if res['error'] == nil
+                Yawast::Utilities.puts_info "\t\tCipher: #{res['cipher_suite']}"
+              end
+            rescue => e
+              Yawast::Utilities.puts_error "SSL: Error Reading Cipher Details: #{e.message}"
             end
           end
         end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Yawast
-  VERSION = '0.5.0.beta4'
+  VERSION = '0.5.0.beta5'
 end

data/yawast.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'ipaddr_extensions', '~> 1.0'
   s.add_runtime_dependency 'ipaddress', '~> 0.8'
   s.add_runtime_dependency 'public_suffix', '~> 2.0'
+  s.add_runtime_dependency 'sslshake', '~> 1.1'
 
   s.bindir            = 'bin'
   s.files             = `git ls-files`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yawast
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta4
+  version: 0.5.0.beta5
 platform: ruby
 authors:
 - Adam Caudill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ssllabs
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sslshake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: YAWAST is an application meant to simplify initial analysis and information
   gathering for penetration testers and security auditors.
 email: adam@adamcaudill.com