diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2013-02-12 20:57:27 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2013-02-12 20:57:27 +0000 |
| commit | 47ad697c8cbd54cdfa126b8f980578a873dfd028 (patch) | |
| tree | 02d8df4d01639add44de6e880a635d2c18ea663f /qpid | |
| parent | 803cc4e4a8b3a26b6f35808a142a3dbaf06bf29e (diff) | |
| download | qpid-python-47ad697c8cbd54cdfa126b8f980578a873dfd028.tar.gz | |
QPID-4554: fix old qmf console to allow keyfile
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1445355 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/extras/qmf/src/py/qmf/console.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qpid/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py index 1fb23a047d..0a30176ed5 100644 --- a/qpid/extras/qmf/src/py/qmf/console.py +++ b/qpid/extras/qmf/src/py/qmf/console.py @@ -2432,10 +2432,13 @@ class Broker(Thread): if sys.version_info[:2] < (2, 6): # 2.6+ uses openssl - it's ok force_blocking = True sock.setblocking(1) + certfile = None if 'ssl_certfile' in self.connectArgs: - connSock = ssl(sock, certfile=self.connectArgs['ssl_certfile']) - else: - connSock = ssl(sock) + certfile = self.connectArgs['ssl_certfile'] + keyfile = None + if 'ssl_keyfile' in self.connectArgs: + keyfile = self.connectArgs['ssl_keyfile'] + connSock = ssl(sock, certfile=certfile, keyfile=keyfile) else: connSock = sock self.conn = Connection(connSock, username=self.authUser, password=self.authPass, |