Merge lp:~alecu/ubuntuone-client/validate-ssl-cert-3-0 into lp:ubuntuone-client/stable-3-0

[Alejandro J. Cura]

- Validate SSL certificates (LP: #882062).

This branch depends on lp:~alecu/ubuntuone-storage-protocol/validate-ssl-cert

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[dobey (dobey)]

review: Approve

=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2012-03-05 13:37:12 +0000
+++ data/syncdaemon.conf	2012-06-06 20:58:18 +0000
@@ -2,7 +2,7 @@
 host.default = fs-1.one.ubuntu.com
 host.help = The server address
 
-dns_srv.default = _https._tcp.fs.ubuntuone.com
+dns_srv.default = _https._tcp.fs.one.ubuntu.com
 dns_srv.help = The DNS SRV record
 
 disable_ssl_verify.default = False
 
=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2012-05-16 22:01:56 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2012-06-06 20:58:18 +0000
@@ -855,7 +855,7 @@
     def _make_connection(self, result):
         """Do the real connect call."""
         host, port = result
-        ssl_context = get_ssl_context(self.disable_ssl_verify)
+        ssl_context = get_ssl_context(self.disable_ssl_verify, host)
         client = yield self.tunnel_runner.get_client()
         if self.use_ssl:
             self.connector = client.connectSSL(host, port, factory=self,