From dd3dc46f4830f02c97a3aa90b9d8873c1fb44556 Mon Sep 17 00:00:00 2001 From: Zuo Haocheng Date: Tue, 25 Jul 2017 20:54:59 +0800 Subject: [PATCH] Updates per code review --- docs/api.rst | 6 +++--- pyftpdlib/handlers.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index e363a6bf..c149aa88 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -559,9 +559,9 @@ Extended handlers .. data:: client_certfile - The path of the certificate to check the client certificate against. - When provided, only allowing clients with a valid certificate to connect - to the server (default ``None``). + The path to a file which contains a certificate to be used to identify + the client. If specified, only clients with a valid certificate are able + to connect to the server (default ``None``). .. versionadded:: 1.5.3 diff --git a/pyftpdlib/handlers.py b/pyftpdlib/handlers.py index d668a7dc..121be61c 100644 --- a/pyftpdlib/handlers.py +++ b/pyftpdlib/handlers.py @@ -3419,7 +3419,6 @@ class TLS_FTPHandler(SSLConnection, FTPHandler): certfile = None keyfile = None ssl_protocol = SSL.SSLv23_METHOD - # client certificate configurable attributes client_certfile = None # - SSLv2 is easily broken and is considered harmful and dangerous # - SSLv3 has several problems and is now dangerous