From 8a6f95c7dc5c2ca9d11eff346da1cc4daf0389ce Mon Sep 17 00:00:00 2001
From: TrustedSec <info@trustedsec.com>
Date: Thu, 29 Sep 2016 22:19:12 -0400
Subject: [PATCH] add tls support for non gmail yahoo and hotmail servers

---
 readme/CHANGELOG                        | 1 +
 src/phishing/smtp/client/smtp_client.py | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/readme/CHANGELOG b/readme/CHANGELOG
index 29abe5315..86465c255 100644
--- a/readme/CHANGELOG
+++ b/readme/CHANGELOG
@@ -6,6 +6,7 @@ version 7.4
 * added new third party module google analytics attack: # https://github.com/ZonkSec/google-analytics-attack. Walkthrough here: http://www.zonksec.com/blog/social-engineering-google-analytics/
 * converted alphanumeric shellcode to accept DNS names
 * changed alphanumeric shellcode to reverse_https instead of reverse_tcp
+* added prompt for TLS support in email phishing
 
 ~~~~~~~~~~~~~~~~
 version 7.3.16
diff --git a/src/phishing/smtp/client/smtp_client.py b/src/phishing/smtp/client/smtp_client.py
index 816e75438..8d2265180 100644
--- a/src/phishing/smtp/client/smtp_client.py
+++ b/src/phishing/smtp/client/smtp_client.py
@@ -356,9 +356,8 @@ else:
     prioflag1 = ' 1 (Highest)'
     prioflag2 = ' High'
 
+
 # Define mail send here
-
-
 def mail(to, subject, text, attach, prioflag1, prioflag2):
     msg = MIMEMultipart()
     msg['From'] = str(
@@ -398,6 +397,10 @@ def mail(to, subject, text, attach, prioflag1, prioflag2):
             except:
                 pass
             mailServer.ehlo()
+    if not "gmail|yahoo|hotmail|" in email_provider: 
+        tls = yesno_prompt(["1"], "Does your server support TLS? [yes|no]")
+        if tls == "YES":
+            mailServer.starttls()
     if counter == 0:
         try:
             if email_provider == "gmail" or email_provider == "yahoo" or email_provider == "hotmail":