Merge lp:~alecu/ubuntuone-storage-protocol/include-valicert into lp:ubuntuone-storage-protocol

[Alejandro J. Cura]

- Add the ValiCert certificate to the custom certificates (LP: #882062).

[Roberto Alsina (ralsina)]

review: Approve

[dobey (dobey)]

You need to update the setup.py as well, so the file is actually installed.

review: Needs Fixing

[lp:~alecu/ubuntuone-storage-protocol/include-valicert]

151. By Alejandro J. Cura on 2012-06-12

Include the certificate in setup.py

[dobey (dobey)]

review: Approve

=== added file 'data/ValiCert_Class_2_VA.pem'
--- data/ValiCert_Class_2_VA.pem	1970-01-01 00:00:00 +0000
+++ data/ValiCert_Class_2_VA.pem	2012-06-12 17:10:44 +0000
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----

=== modified file 'setup.py'
--- setup.py	2012-05-24 19:10:04 +0000
+++ setup.py	2012-06-12 17:10:44 +0000
@@ -76,6 +76,7 @@
       extra_path='ubuntuone-storage-protocol',
       data_files=[(ssl_cert_location,
                    ['data/UbuntuOne-Go_Daddy_CA.pem',
+                    'data/ValiCert_Class_2_VA.pem',
                     'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
 
       cmdclass={

=== modified file 'ubuntuone/storageprotocol/context.py'
--- ubuntuone/storageprotocol/context.py	2012-06-08 13:32:37 +0000
+++ ubuntuone/storageprotocol/context.py	2012-06-12 17:10:44 +0000
@@ -92,7 +92,9 @@
                      'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
     ca_file_2 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
                     'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
-    return [ca_file.original, ca_file_2.original]
+    ca_file_3 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
+                    'ValiCert_Class_2_VA.pem'), 'r').read())
+    return [ca_file.original, ca_file_2.original, ca_file_3.original]
 
 
 def get_ssl_context(no_verify, hostname=None):