summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Toivonen <heikki@heikkitoivonen.net>2006-04-28 04:27:48 +0000
committerHeikki Toivonen <heikki@heikkitoivonen.net>2006-04-28 04:27:48 +0000
commitc39055473a94fdab2129fa5918005bc4379ca54b (patch)
treee5aaf4a5ab9a4ed0080162319a68379c3b75d313
parentf76225698b4531d67623b3026ef7b979545d216a (diff)
downloadm2crypto-c39055473a94fdab2129fa5918005bc4379ca54b.tar.gz
Fixed SSL.Connection.set_client_CA_list_from_file to use the
implemented function. git-svn-id: http://svn.osafoundation.org/m2crypto/trunk@431 2715db39-9adf-0310-9c64-84f055769b4b
-rw-r--r--CHANGES4
-rw-r--r--M2Crypto/SSL/Connection.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 277dbed..130c7e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,8 @@
gets deleted
- It is now possible to set and get non-nid values to X509_Name (previously
only set worked)
+- SSL.Connection.set_client_CA_list_from_file now uses the actual implementd
+ function instead of raising exception
- Multithreaded SSL no longer uses the SSL_set/get_app_data to set and
restore thread state, but uses the standard PyGILState_STATE instead.
- m2urllib no longer outputs the HTTP headers (there was an erronous call
@@ -48,7 +50,7 @@
- Memory leak fixes
- SWIG and compiler warning fixes
- More and better Epydoc formatted docstrings
-- More tests, also made many demos into tests
+- More than doubled the number of unit tests, also made many demos into tests
0.15
----
diff --git a/M2Crypto/SSL/Connection.py b/M2Crypto/SSL/Connection.py
index 60b4860..5d81f95 100644
--- a/M2Crypto/SSL/Connection.py
+++ b/M2Crypto/SSL/Connection.py
@@ -79,7 +79,7 @@ class Connection:
m2.ssl_set_bio(self.ssl, readbio._ptr(), writebio._ptr())
def set_client_CA_list_from_file(self, cafile):
- m2.ssl_set_client_CA_list(self.ssl, cafile)
+ m2.ssl_set_client_CA_list_from_file(self.ssl, cafile)
def set_client_CA_list_from_context(self):
m2.ssl_set_client_CA_list_from_context(self.ssl, self.ctx.ctx)