[Commits] (heikki) Bug 1975, check that certificate returned by host was issued for said host (IMAP and SMTP).

[commits at osafoundation.org]

Commit by: heikki
Modified files:
chandler/Makefile 1.80 1.81
chandler/parcels/osaf/mail/imap.py 1.42 1.43
chandler/parcels/osaf/mail/smtp.py 1.28 1.29

Log message:
Bug 1975, check that certificate returned by host was issued for said host (IMAP and SMTP).

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/Makefile.diff?r1=text&tr1=1.80&r2=text&tr2=1.81
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/mail/imap.py.diff?r1=text&tr1=1.42&r2=text&tr2=1.43
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/mail/smtp.py.diff?r1=text&tr1=1.28&r2=text&tr2=1.29

Index: chandler/Makefile
diff -u chandler/Makefile:1.80 chandler/Makefile:1.81
--- chandler/Makefile:1.80	Thu Jan 27 22:03:43 2005
+++ chandler/Makefile	Wed Feb  2 10:45:03 2005
@@ -25,7 +25,7 @@
              ../epydoc-$(SNAP)-2.1-2.tar.gz \
              ../jabberpy-$(SNAP)-0.4-0-2.tar.gz \
              ../libxml2-$(SNAP)-2.6.16-3.tar.gz \
-             ../m2crypto-$(SNAP)-0.12-7.tar.gz \
+             ../m2crypto-$(SNAP)-0.12-8.tar.gz \
              ../pychecker-$(SNAP)-0.8.13-2.tar.gz \
              ../pylucene-$(SNAP)-0.9.6-1.tar.gz \
              ../python-$(SNAP)-2.4-2.tar.gz \

Index: chandler/parcels/osaf/mail/imap.py
diff -u chandler/parcels/osaf/mail/imap.py:1.42 chandler/parcels/osaf/mail/imap.py:1.43
--- chandler/parcels/osaf/mail/imap.py:1.42	Wed Feb  2 09:56:28 2005
+++ chandler/parcels/osaf/mail/imap.py	Wed Feb  2 10:45:03 2005
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.42 $"
-__date__      = "$Date: 2005/02/02 17:56:28 $"
+__revision__  = "$Revision: 1.43 $"
+__date__      = "$Date: 2005/02/02 18:45:03 $"
 __copyright__ = "Copyright (c) 2005 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -24,6 +24,7 @@
 import osaf.contentmodel.mail.Mail as Mail
 import application.Globals as Globals
 import M2Crypto.SSL.TwistedProtocolWrapper as wrapper
+import M2Crypto.SSL as SSL
 
 #Chandler Mail Service imports
 import message as message
@@ -177,6 +178,7 @@
         self.wrappingFactory.protocol = wrapper.TLSProtocolWrapper
         self.factory.startTLS = self.account.useSSL
         self.factory.getContext = lambda : Globals.crypto.getSSLContext()
+        self.factory.sslChecker = SSL.Checker.Checker()
         reactor.connectTCP(self.account.host, self.account.port, self.wrappingFactory)
 
     def catchErrors(self, err):

Index: chandler/parcels/osaf/mail/smtp.py
diff -u chandler/parcels/osaf/mail/smtp.py:1.28 chandler/parcels/osaf/mail/smtp.py:1.29
--- chandler/parcels/osaf/mail/smtp.py:1.28	Fri Jan 28 14:31:05 2005
+++ chandler/parcels/osaf/mail/smtp.py	Wed Feb  2 10:45:03 2005
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.28 $"
-__date__      = "$Date: 2005/01/28 22:31:05 $"
+__revision__  = "$Revision: 1.29 $"
+__date__      = "$Date: 2005/02/02 18:45:03 $"
 __copyright__ = "Copyright (c) 2005 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -22,6 +22,7 @@
 import chandlerdb.util.UUID as UUID
 import application.Globals as Globals
 import M2Crypto.SSL.TwistedProtocolWrapper as wrapper
+import M2Crypto.SSL as SSL
 
 #Chandler Mail Service imports
 import constants as constants
@@ -404,6 +405,7 @@
                                           sslContext, heloFallback, authRequired, account.useSSL)
 
         factory.protocol = ChandlerESMTPSender
+        factory.sslChecker = SSL.Checker.Checker()
         wrappingFactory = policies.WrappingFactory(factory)
         wrappingFactory.protocol = wrapper.TLSProtocolWrapper