From 614c8b68fbbffe02a92fd0dc4338296c02050411 Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Mon, 5 Mar 2018 17:08:34 -0500 Subject: [PATCH] Use STARTTLS instead of SSL --- parsedmarc.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/parsedmarc.py b/parsedmarc.py index bb10923..ef4a81b 100644 --- a/parsedmarc.py +++ b/parsedmarc.py @@ -1214,7 +1214,7 @@ def email_results(results, host, mail_from, mail_to, user=None, ssl_context: SSL context options Notes: - The server is required to support TLS for privacy reasons + Server must support STARTTLS """ date_string = datetime.utcnow().strftime("%Y-%m-%d") if attachment_filename: @@ -1244,7 +1244,9 @@ def email_results(results, host, mail_from, mail_to, user=None, try: if ssl_context is None: ssl_context = ssl.create_default_context() - server = smtplib.SMTP_SSL(host, context=ssl_context) + server = smtplib.SMTP(host) + server.ehlo() + server.starttls(context=ssl_context) if user and password: server.login(user, password) server.sendmail(mail_from, mail_to, msg.as_string())