From 899a7c9ea484335dcc8be37139e8b6b855ca46df Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <FireFart@gmail.com>
Date: Wed, 9 Apr 2014 17:51:44 +0200
Subject: [PATCH] heartbleed bugfix for pop3

---
 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 0a7a88f0ca..c844930e3e 100644
--- a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
@@ -156,7 +156,7 @@ class Metasploit3 < Msf::Auxiliary
     sock.get_once
     sock.put("CAPA\r\n")
     res = sock.get_once
-    if res.nil? || res =~ /^-/
+    if res.nil? || res =~ /^-/ || res !~ /STLS/
       return nil
     end
     sock.put("STLS\r\n")
@@ -164,6 +164,7 @@ class Metasploit3 < Msf::Auxiliary
     if res.nil? || res =~ /^-/
       return nil
     end
+    res
   end
 
   def tls_jabber