diff --git a/lib/msf/core/exploit/smtp_deliver.rb b/lib/msf/core/exploit/smtp_deliver.rb
index 0dec10cc71..18fde235a0 100644
--- a/lib/msf/core/exploit/smtp_deliver.rb
+++ b/lib/msf/core/exploit/smtp_deliver.rb
@@ -84,7 +84,7 @@ module Exploit::Remote::SMTPDeliver
     if res =~ /STARTTLS/
       print_status("Starting tls")
       raw_send_recv("STARTTLS\r\n", nsock)
-      swap_sock_plain_to_ssl
+      swap_sock_plain_to_ssl(nsock)
       res = raw_send_recv("EHLO #{domain}\r\n", nsock)
     end
 
@@ -229,7 +229,7 @@ protected
   end
 
   def generate_ssl_context
-    ctx = OpenSSL::SSL::SSLContext.new(:SSLv3)
+    ctx = OpenSSL::SSL::SSLContext.new
     ctx.key = OpenSSL::PKey::RSA.new(1024){ }
 
     ctx.session_id_context = Rex::Text.rand_text(16)