From d43d1912b376322e27fdcda551a73f9ff5487972 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 3 Aug 2012 12:13:32 +0000 Subject: QPID-3858: Updated branch - merged from trunk r.1368650 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1368910 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'python/qpid/util.py') diff --git a/python/qpid/util.py b/python/qpid/util.py index 89677289e2..7541595453 100644 --- a/python/qpid/util.py +++ b/python/qpid/util.py @@ -25,9 +25,9 @@ except ImportError: from socket import ssl as wrap_socket class ssl: - def __init__(self, sock): + def __init__(self, sock, keyfile=None, certfile=None, trustfile=None): self.sock = sock - self.ssl = wrap_socket(sock) + self.ssl = wrap_socket(sock, keyfile=keyfile, certfile=certfile, ca_certs=trustfile) def recv(self, n): return self.ssl.read(n) -- cgit v1.2.1