Skip to content

Add new TLS support and switch to Python 3 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BlacklightShining wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add new TLS support and switch to Python 3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c74a71
Whitespace fixes
BlacklightShining Aug 27, 2015
79e630c
Added native TLS support; switched to Python 3; cleaned up code some
BlacklightShining Aug 28, 2015
0a20b08
Changed the shebangs from python to python3
BlacklightShining Sep 1, 2015
918dd75
Updated manual page to reflect TLS updates
BlacklightShining Oct 1, 2015
8840366
Always give our address as 0.0.0.0 in the EHLO
BlacklightShining Feb 4, 2016
1e6820b
Tweaked code to actually work under Python 3
BlacklightShining Oct 3, 2016
26763d4
Moved SMTP.connect() call to `SMTP` initialization
BlacklightShining Oct 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions man/man1/putmail.py.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,34 @@ The password used when authenticating to the SMTP server.
The server port. The default value is 25.
.TP
\fItls\fR
Boolean option to enable or disable TLS. It is disabled by
default or when its value is \fIno\fR, \fI0\fR, \fIoff\fR
or \fIfalse\fR. Set it to \fIyes\fR, \fI1\fR, \fIon\fR
or \fItrue\fR to enable TLS.
The TLS mode to use, disabled by default or when set to
\fIoff\fR. Set it to \fInative\fR or \fIstarttls\fR to use TLS.
When active, \fBputmail.py\fR will refuse to authenticate or
send mail without TLS.
.TP
\fItls_versions\fR
A whitespace-separated list of TLS versions to use. Ignored
when \fItls\fR is inactive. Known values: \fIssl2\fR,
\fIssl3\fR, \fItls1\fR, \fItls1_1\fR, \fItls1_2\fR. Note that
\fBputmail.py\fR cannot use a TLS version unless it is also
supported by the underlying Python implementation (and, by
extension, the underlying OpenSSL implementation). The default
depends on the Python implementation; at the time of
publication, it is recommended that this option be set
manually and include only TLS 1.1 and newer.
.TP
\fIquiet\fR
Boolean option, disabled by default. When active, errors
and warnings related to communication with the SMTP server
will not be printed on screen. See the \fItls\fR option
for possible values. Use it with care and once you know
your configuration works. In most cases this will not be
needed. However, sometimes warnings about improper
connection shutdown can get really annoying. Errors
related to malformed configuration files, absence of
message recipients and others will still be printed.
will not be printed on screen. It is disabled by default or
when its value is \fIno\fR, \fI0\fR, \fIoff\fR or \fIfalse\fR.
Set it to \fIyes\fR, \fI1\fR, \fIon\fR or \fItrue\fR to enable
TLS. Use it with care and once you know your configuration
works. In most cases this will not be needed. However,
sometimes warnings about improper connection shutdown can get
really annoying. Errors related to malformed configuration
files, absence of message recipients and others will still be
printed.
.SH "COMMAND LINE OPTIONS"
.LP
.TP
Expand Down
Loading