summaryrefslogtreecommitdiff
path: root/python/qpid/util.py
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2012-07-26 14:38:53 +0000
committerTed Ross <tross@apache.org>2012-07-26 14:38:53 +0000
commitf37e96a40605ec79edd8d46c1934487578b6682e (patch)
treea9948eef3f9cfcffac5a980e2413b998e198a98c /python/qpid/util.py
parent4e3569802ff6e43836de96e0de569e8fda0b0b5a (diff)
downloadqpid-python-f37e96a40605ec79edd8d46c1934487578b6682e.tar.gz
QPID-3175 - Added SSL/x.509-auth capability to Python clients and Python tools
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1366020 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python/qpid/util.py')
-rw-r--r--python/qpid/util.py4
1 files changed, 2 insertions, 2 deletions
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)