Land #3256, SMTP RFC compliance for Heartbleed

2014-04-14 17:52:56 -05:00 · 2014-04-14 17:52:56 -05:00 · 66cc050876
parent 0a4c10876d 634a03a852
commit 66cc050876
1 changed files with 2 additions and 2 deletions
--- a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
@ -155,13 +155,13 @@ class Metasploit3 < Msf::Auxiliary
  def tls_smtp
    # https://tools.ietf.org/html/rfc3207
    sock.get_once
-    sock.put("EHLO #{Rex::Text.rand_text_alpha(10)}\n")
+    sock.put("EHLO #{Rex::Text.rand_text_alpha(10)}\r\n")
    res = sock.get_once

    unless res && res =~ /STARTTLS/
      return nil
    end
-    sock.put("STARTTLS\n")
+    sock.put("STARTTLS\r\n")
    sock.get_once
  end