Ubuntu One storage protocol

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

  1. include-valicert
  2. Merge into trunk
Proposed by Alejandro J. Cura
Status: Merged
Approved by: dobey
Approved revision: 151
Merged at revision: 150
Proposed branch: lp:~alecu/ubuntuone-storage-protocol/include-valicert
Merge into: lp:ubuntuone-storage-protocol
Diff against target: 49 lines (+22/-1)
3 files modified
data/ValiCert_Class_2_VA.pem (+18/-0)
setup.py (+1/-0)
ubuntuone/storageprotocol/context.py (+3/-1)
To merge this branch: bzr merge lp:~alecu/ubuntuone-storage-protocol/include-valicert
Reviewer Review Type Date Requested Status
dobey (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+109883@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
dobey (dobey) wrote :

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 updated
151. By Alejandro J. Cura

Include the certificate in setup.py

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/ValiCert_Class_2_VA.pem'
2--- data/ValiCert_Class_2_VA.pem 1970-01-01 00:00:00 +0000
3+++ data/ValiCert_Class_2_VA.pem 2012-06-12 17:10:44 +0000
4@@ -0,0 +1,18 @@
5+-----BEGIN CERTIFICATE-----
6+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
7+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
8+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
9+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
10+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
11+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
12+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
13+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
14+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
15+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
16+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
17+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
18+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
19+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
20+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
21+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
22+-----END CERTIFICATE-----
23
24=== modified file 'setup.py'
25--- setup.py 2012-05-24 19:10:04 +0000
26+++ setup.py 2012-06-12 17:10:44 +0000
27@@ -76,6 +76,7 @@
28 extra_path='ubuntuone-storage-protocol',
29 data_files=[(ssl_cert_location,
30 ['data/UbuntuOne-Go_Daddy_CA.pem',
31+ 'data/ValiCert_Class_2_VA.pem',
32 'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
33
34 cmdclass={
35
36=== modified file 'ubuntuone/storageprotocol/context.py'
37--- ubuntuone/storageprotocol/context.py 2012-06-08 13:32:37 +0000
38+++ ubuntuone/storageprotocol/context.py 2012-06-12 17:10:44 +0000
39@@ -92,7 +92,9 @@
40 'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
41 ca_file_2 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
42 'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
43- return [ca_file.original, ca_file_2.original]
44+ ca_file_3 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
45+ 'ValiCert_Class_2_VA.pem'), 'r').read())
46+ return [ca_file.original, ca_file_2.original, ca_file_3.original]
47
48
49 def get_ssl_context(no_verify, hostname=None):

Subscribers

People subscribed via source and target branches