Fix SSL fingerprint was not always checked
As reported by James Cook, we would not check the fingerprint of the SSL server, as we were looking for the 'ssl' module in locals() rather than globals(). Ooops! Rather than using globals() though, I simply remove the by-now superfluous check. We now rely on python2.6 and we unconditionally import the SSL module in any case, so it needs to be there. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
# imaplib utilities
|
||||
# Copyright (C) 2002-2007 John Goerzen <jgoerzen@complete.org>
|
||||
# 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
|
||||
# 2012-2012 Sebastian Spaeth <Sebastian@SSpaeth.de>
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
@ -143,8 +143,7 @@ class WrappedIMAP4_SSL(UsefulIMAPMixIn, IMAP4_SSL):
|
||||
|
||||
def open(self, host=None, port=None):
|
||||
super(WrappedIMAP4_SSL, self).open(host, port)
|
||||
if (self._fingerprint or not self.ca_certs) and\
|
||||
'ssl' in locals(): # <--disable for python 2.5
|
||||
if (self._fingerprint or not self.ca_certs):
|
||||
# compare fingerprints
|
||||
fingerprint = sha1(self.sock.getpeercert(True)).hexdigest()
|
||||
if fingerprint != self._fingerprint:
|
||||
|
Reference in New Issue
Block a user