From 6ab3478c7e0151f7610ef8a54a3d31c447914817 Mon Sep 17 00:00:00 2001
From: gigstorm <patrick.kiley@knowledgecg.com>
Date: Fri, 11 Apr 2014 12:41:17 -0700
Subject: [PATCH 1/3] Update to include SSL Version 3 protocol

SSL Version 3 will also respond to this and a server configured to respond to SSL version 3 but not TLS will show false negative without this option (proven).  May need to update cipher suites to include this option.
---
 modules/auxiliary/scanner/ssl/openssl_heartbleed.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
index e643fcfefe..716724e0c5 100644
--- a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
@@ -69,6 +69,7 @@ class Metasploit3 < Msf::Auxiliary
   HEARTBEAT_RECORD_TYPE = 0x18
   ALERT_RECORD_TYPE     = 0x15
   TLS_VERSION = {
+    '3.0' => 0x0300,
     '1.0' => 0x0301,
     '1.1' => 0x0302,
     '1.2' => 0x0303
@@ -121,7 +122,7 @@ class Metasploit3 < Msf::Auxiliary
       [
         Opt::RPORT(443),
         OptEnum.new('STARTTLS', [true, 'Protocol to use with STARTTLS, None to avoid STARTTLS ', 'None', [ 'None', 'SMTP', 'IMAP', 'JABBER', 'POP3', 'FTP' ]]),
-        OptEnum.new('TLSVERSION', [true, 'TLS version to use', '1.0', ['1.0', '1.1', '1.2']]),
+        OptEnum.new('TLSVERSION', [true, 'TLS/SSL version to use', '1.0', ['SSLv3','1.0', '1.1', '1.2']]),
         OptBool.new('STOREDUMP', [true, 'Store leaked memory in a file', false]),
         OptRegexp.new('DUMPFILTER', [false, 'Pattern to filter leaked memory before storing', nil])
       ], self.class)

From f1443c039e04e81efccf9a9a58a4035cfa273c62 Mon Sep 17 00:00:00 2001
From: gigstorm <patrick.kiley@knowledgecg.com>
Date: Fri, 11 Apr 2014 14:01:28 -0700
Subject: [PATCH 2/3] Updated hash value to SSLv3

Tested and working on server that has SSLv3 only enabled
---
 modules/auxiliary/scanner/ssl/openssl_heartbleed.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
index 716724e0c5..ab56754a55 100644
--- a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
@@ -69,7 +69,7 @@ class Metasploit3 < Msf::Auxiliary
   HEARTBEAT_RECORD_TYPE = 0x18
   ALERT_RECORD_TYPE     = 0x15
   TLS_VERSION = {
-    '3.0' => 0x0300,
+    'SSLv3' => 0x0300,
     '1.0' => 0x0301,
     '1.1' => 0x0302,
     '1.2' => 0x0303

From f115a7f6e16c8a8ac370189b8272c3f6b180511c Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <FireFart@gmail.com>
Date: Thu, 10 Apr 2014 02:52:05 +0200
Subject: [PATCH 3/3] Fix intendation

---
 modules/auxiliary/scanner/ssl/openssl_heartbleed.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
index ab56754a55..1018e7b230 100644
--- a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
@@ -70,9 +70,9 @@ class Metasploit3 < Msf::Auxiliary
   ALERT_RECORD_TYPE     = 0x15
   TLS_VERSION = {
     'SSLv3' => 0x0300,
-    '1.0' => 0x0301,
-    '1.1' => 0x0302,
-    '1.2' => 0x0303
+    '1.0'   => 0x0301,
+    '1.1'   => 0x0302,
+    '1.2'   => 0x0303
   }
 
   TLS_CALLBACKS = {