summaryrefslogtreecommitdiff
path: root/qpid/extras
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
commit636830f7161ee1bc772e7d96716cdb3264002cb7 (patch)
tree3073c079723ccd3c4279afc4e20999a905be8896 /qpid/extras
parentf5707c7969f5bac6700c37c946dbfb0eb9a8d7ef (diff)
downloadqpid-python-636830f7161ee1bc772e7d96716cdb3264002cb7.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@1366020 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/extras')
-rw-r--r--qpid/extras/qmf/src/py/qmf/console.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/qpid/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py
index bd1ddb2833..90cc17d32b 100644
--- a/qpid/extras/qmf/src/py/qmf/console.py
+++ b/qpid/extras/qmf/src/py/qmf/console.py
@@ -2422,8 +2422,12 @@ class Broker(Thread):
sock.settimeout(5)
oldTimeout = sock.gettimeout()
sock.settimeout(self.connTimeout)
+ connSock = None
if self.ssl:
- connSock = ssl(sock)
+ if 'ssl_certfile' in self.connectArgs:
+ connSock = ssl(sock, certfile=self.connectArgs['ssl_certfile'])
+ else:
+ connSock = ssl(sock)
else:
connSock = sock
self.conn = Connection(connSock, username=self.authUser, password=self.authPass,