[pyftpdlib] r1252 committed - FTPS: add ability to load a certificate chain file

[pyft...@googlecode.com]

Revision: 1252
Author: g.rodola
Date: Fri Apr 11 17:11:38 2014 UTC
Log: FTPS: add ability to load a certificate chain file
http://code.google.com/p/pyftpdlib/source/detail?r=1252

Modified:
/trunk/CREDITS
/trunk/HISTORY
/trunk/Makefile
/trunk/pyftpdlib/handlers.py

=======================================
--- /trunk/CREDITS Tue Feb 4 22:32:54 2014 UTC
+++ /trunk/CREDITS Fri Apr 11 17:11:38 2014 UTC
@@ -173,3 +173,6 @@

E: d...@devicenull.org
D: issue 280
+
+N: briantomko
+D: issue 262
=======================================
--- /trunk/HISTORY Fri Apr 4 13:10:40 2014 UTC
+++ /trunk/HISTORY Fri Apr 11 17:11:38 2014 UTC
@@ -9,6 +9,8 @@

ENHANCEMENTS

+ * #262: FTPS is now able to load a certificate chain file. (patch by
+ briantomko)
* #277: added a make file for running tests and for other repetitive tasks
(also for Windows).
* #281: tarballs are now hosted on PYPI.
=======================================
--- /trunk/Makefile Mon Dec 30 10:45:50 2013 UTC
+++ /trunk/Makefile Fri Apr 11 17:11:38 2014 UTC
@@ -2,9 +2,6 @@
# To use a specific Python version run:
# $ make install PYTHON=python3.3

-.PHONY: build install uninstall test test_contrib nosetests pep8 pyflakes \
- clean upload-src
-
PYTHON=python
TSCRIPT=test/test_ftpd.py
FLAGS=
@@ -40,7 +37,7 @@
test: install
$(PYTHON) $(TSCRIPT)

-test-contrib:
+test-contrib: install
$(PYTHON) test/test_contrib.py

nosetest: install
=======================================
--- /trunk/pyftpdlib/handlers.py Mon Dec 30 11:46:07 2013 UTC
+++ /trunk/pyftpdlib/handlers.py Fri Apr 11 17:11:38 2014 UTC
@@ -3296,7 +3296,7 @@
cls.ssl_context.set_options(SSL.OP_NO_SSLv2)
else:
warnings.warn("SSLv2 protocol is insecure",
RuntimeWarning)
- cls.ssl_context.use_certificate_file(cls.certfile)
+ cls.ssl_context.use_certificate_chain_file(cls.certfile)
if not cls.keyfile:
cls.keyfile = cls.certfile
cls.ssl_context.use_privatekey_file(cls.keyfile)