Merge ~ahasenack/ubuntu/+source/ruby2.5:disco-ruby-ftbfs-certs into ubuntu/+source/ruby2.5:ubuntu/devel
- Git
- lp:~ahasenack/ubuntu/+source/ruby2.5
- disco-ruby-ftbfs-certs
- Merge into ubuntu/devel
Proposed by
Andreas Hasenack
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andreas Hasenack | ||||
Approved revision: | ef623bb64f23b30db27666cda5c9ab291214fb84 | ||||
Merge reported by: | Christian Ehrhardt | ||||
Merged at revision: | ef623bb64f23b30db27666cda5c9ab291214fb84 | ||||
Proposed branch: | ~ahasenack/ubuntu/+source/ruby2.5:disco-ruby-ftbfs-certs | ||||
Merge into: | ubuntu/+source/ruby2.5:ubuntu/devel | ||||
Diff against target: |
540 lines (+512/-0) 4 files modified
debian/changelog (+7/-0) debian/patches/series (+2/-0) debian/patches/update-cert-1.patch (+284/-0) debian/patches/update-cert-2.patch (+219/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Andres Klode (community) | Approve | ||
Canonical Server packageset reviewers | Pending | ||
Canonical Server | Pending | ||
Review via email:
|
Commit message
Description of the change
Fixes an FTBFS caused by failing tests run at package build time. Patches located by juliank and applied as-is, with just a few dep3 headers added (bug and origin url).
PPA with test build: ppa:ahasenack/
https:/
To post a comment you must log in.
Revision history for this message

Andreas Hasenack (ahasenack) wrote : | # |
Just updated the patches with a link to the debian bug at https:/
Revision history for this message

Andreas Hasenack (ahasenack) wrote : | # |
Thanks, tagged and uploaded.
Revision history for this message

Christian Ehrhardt (paelzer) wrote : | # |
I see 2.5.3-3ubuntu3 in disco-release so I'd call that merged.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index fa533a2..9982c1b 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,10 @@ |
6 | +ruby2.5 (2.5.3-3ubuntu3) disco; urgency=medium |
7 | + |
8 | + * d/p/update-cert-{1,2}.patch: update certificates to fix FTBFS |
9 | + (LP: #1812669) |
10 | + |
11 | + -- Andreas Hasenack <andreas@canonical.com> Mon, 21 Jan 2019 10:59:42 -0200 |
12 | + |
13 | ruby2.5 (2.5.3-3ubuntu2) disco; urgency=medium |
14 | |
15 | * No-change rebuild for readline soname change. |
16 | diff --git a/debian/patches/series b/debian/patches/series |
17 | index 7ef25fc..45a8734 100644 |
18 | --- a/debian/patches/series |
19 | +++ b/debian/patches/series |
20 | @@ -13,3 +13,5 @@ |
21 | 0001-openssl-buffering.rb-no-RS-when-output.patch |
22 | 0006-Workaround-for-old-LibreSSL.patch |
23 | rubygems-2388.patch |
24 | +update-cert-1.patch |
25 | +update-cert-2.patch |
26 | diff --git a/debian/patches/update-cert-1.patch b/debian/patches/update-cert-1.patch |
27 | new file mode 100644 |
28 | index 0000000..378ed48 |
29 | --- /dev/null |
30 | +++ b/debian/patches/update-cert-1.patch |
31 | @@ -0,0 +1,284 @@ |
32 | +From f234e6c3d3170f37508e214cdaef78d4b2584e5a Mon Sep 17 00:00:00 2001 |
33 | +From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> |
34 | +Date: Wed, 2 Jan 2019 03:08:20 +0000 |
35 | +Subject: [PATCH] Try to update cert |
36 | +Origin: https://github.com/ruby/ruby/commit/f234e6c3d3170f37508e214cdaef78d4b2584e5a |
37 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby2.5/+bug/1812669 |
38 | +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919516 |
39 | +Last-Update: 2019-01-21 |
40 | + |
41 | +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e |
42 | +--- |
43 | + test/net/fixtures/cacert.pem | 86 +++++++------------------- |
44 | + test/net/fixtures/server.crt | 113 +++++++++++++++++++++++------------ |
45 | + test/net/fixtures/server.key | 43 ++++++++----- |
46 | + 3 files changed, 124 insertions(+), 118 deletions(-) |
47 | + |
48 | +diff --git a/test/net/fixtures/cacert.pem b/test/net/fixtures/cacert.pem |
49 | +index 70733878779f..f623bd62ed37 100644 |
50 | +--- a/test/net/fixtures/cacert.pem |
51 | ++++ b/test/net/fixtures/cacert.pem |
52 | +@@ -1,66 +1,24 @@ |
53 | +-Certificate: |
54 | +- Data: |
55 | +- Version: 3 (0x2) |
56 | +- Serial Number: |
57 | +- b9:90:a2:bf:62:69:17:9c |
58 | +- Signature Algorithm: sha1WithRSAEncryption |
59 | +- Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
60 | +- Validity |
61 | +- Not Before: Jan 3 01:34:17 2014 GMT |
62 | +- Not After : Jan 2 01:34:17 2019 GMT |
63 | +- Subject: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
64 | +- Subject Public Key Info: |
65 | +- Public Key Algorithm: rsaEncryption |
66 | +- RSA Public Key: (1024 bit) |
67 | +- Modulus (1024 bit): |
68 | +- 00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6: |
69 | +- bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be: |
70 | +- 9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13: |
71 | +- 9d:7e:eb:a2:06:e2:ea:7d:07:c7:c7:99:c7:fb:d5: |
72 | +- b8:eb:63:77:62:2b:18:12:c3:53:58:d0:f5:c7:40: |
73 | +- 0c:01:d1:26:82:34:16:09:e3:dc:65:f4:dc:bb:5d: |
74 | +- a5:41:60:e7:a9:74:ba:d7:4c:b6:a3:9c:c5:8c:89: |
75 | +- af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6: |
76 | +- d0:fc:d6:eb:fc:06:82:10:fb |
77 | +- Exponent: 65537 (0x10001) |
78 | +- X509v3 extensions: |
79 | +- X509v3 Subject Key Identifier: |
80 | +- E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2 |
81 | +- X509v3 Authority Key Identifier: |
82 | +- keyid:E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2 |
83 | +- DirName:/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
84 | +- serial:B9:90:A2:BF:62:69:17:9C |
85 | +- |
86 | +- X509v3 Basic Constraints: |
87 | +- CA:TRUE |
88 | +- Signature Algorithm: sha1WithRSAEncryption |
89 | +- 8f:77:06:4e:31:72:12:ee:68:09:70:27:d4:31:85:ef:10:95: |
90 | +- f9:0f:2b:66:63:08:37:88:6e:b7:9b:40:3e:18:77:33:86:e8: |
91 | +- 61:6a:b7:3c:cb:c7:a6:d6:d5:92:6a:1f:56:d0:9f:5c:32:56: |
92 | +- d3:37:52:fe:0e:20:c2:7a:0d:fe:2d:3c:81:da:b8:7f:4d:6a: |
93 | +- 08:01:d9:be:7a:a2:15:be:a6:ce:49:64:90:8c:9a:ca:6e:2e: |
94 | +- 84:48:1d:94:19:56:94:46:aa:25:9b:68:c2:80:60:bf:cb:2e: |
95 | +- 35:03:ea:0a:65:5a:33:38:c6:cc:81:46:c0:bc:36:86:96:39: |
96 | +- 10:7d |
97 | + -----BEGIN CERTIFICATE----- |
98 | +-MIIDjTCCAvagAwIBAgIJALmQor9iaRecMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD |
99 | +-VQQGEwJKUDEQMA4GA1UECBMHU2hpbWFuZTEUMBIGA1UEBxMLTWF0ei1lIGNpdHkx |
100 | +-FzAVBgNVBAoTDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDEwxSdWJ5IFRlc3QgQ0Ex |
101 | +-JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTQwMTAz |
102 | +-MDEzNDE3WhcNMTkwMTAyMDEzNDE3WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT |
103 | +-B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv |
104 | +-cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz |
105 | +-ZWN1cml0eUBydWJ5LWxhbmcub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB |
106 | +-gQDbddBF3rHfv3GgDrCl5rz0HJ3lJWdkxXvL8a/Gvpqq6n4PzAWv70BpBrLJE51+ |
107 | +-66IG4up9B8fHmcf71bjrY3diKxgSw1NY0PXHQAwB0SaCNBYJ49xl9Ny7XaVBYOep |
108 | +-dLrXTLajnMWMia/L6J8F/ur+ZCS/5+3j9tD81uv8BoIQ+wIDAQABo4H0MIHxMB0G |
109 | +-A1UdDgQWBBToflisE3sDIo2erzILhImAgAwewjCBwQYDVR0jBIG5MIG2gBToflis |
110 | +-E3sDIo2erzILhImAgAwewqGBkqSBjzCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT |
111 | +-B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv |
112 | +-cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz |
113 | +-ZWN1cml0eUBydWJ5LWxhbmcub3JnggkAuZCiv2JpF5wwDAYDVR0TBAUwAwEB/zAN |
114 | +-BgkqhkiG9w0BAQUFAAOBgQCPdwZOMXIS7mgJcCfUMYXvEJX5DytmYwg3iG63m0A+ |
115 | +-GHczhuhharc8y8em1tWSah9W0J9cMlbTN1L+DiDCeg3+LTyB2rh/TWoIAdm+eqIV |
116 | +-vqbOSWSQjJrKbi6ESB2UGVaURqolm2jCgGC/yy41A+oKZVozOMbMgUbAvDaGljkQ |
117 | +-fQ== |
118 | ++MIID7TCCAtWgAwIBAgIJAIltvxrFAuSnMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD |
119 | ++VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx |
120 | ++FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex |
121 | ++JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTkwMTAy |
122 | ++MDI1ODI4WhcNMjQwMTAxMDI1ODI4WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM |
123 | ++B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv |
124 | ++cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz |
125 | ++ZWN1cml0eUBydWJ5LWxhbmcub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB |
126 | ++CgKCAQEAznlbjRVhz1NlutHVrhcGnK8W0qug2ujKXv1njSC4U6nJF6py7I9EeehV |
127 | ++SaKePyv+I9z3K1LnfUHOtUbdwdKC77yN66A6q2aqzu5q09/NSykcZGOIF0GuItYI |
128 | ++3nvW3IqBddff2ffsyR+9pBjfb5AIPP08WowF9q4s1eGULwZc4w2B8PFhtxYANd7d |
129 | ++BvGLXFlcufv9tDtzyRi4t7eqxCRJkZQIZNZ6DHHIJrNxejOILfHLarI12yk8VK6L |
130 | ++2LG4WgGqyeePiRyd1o1MbuiAFYqAwpXNUbRKg5NaZGwBHZk8UZ+uFKt1QMBURO5R |
131 | ++WFy1c349jbWszTqFyL4Lnbg9HhAowQIDAQABo1AwTjAdBgNVHQ4EFgQU9tEiKdU9 |
132 | ++I9derQyc5nWPnc34nVMwHwYDVR0jBBgwFoAU9tEiKdU9I9derQyc5nWPnc34nVMw |
133 | ++DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxj7F/u3C3fgq24N7hGRA |
134 | ++of7ClFQxGmo/IGT0AISzW3HiVYiFaikKhbO1NwD9aBpD8Zwe62sCqMh8jGV/b0+q |
135 | ++aOORnWYNy2R6r9FkASAglmdF6xn3bhgGD5ls4pCvcG9FynGnGc24g6MrjFNrBYUS |
136 | ++2iIZsg36i0IJswo/Dy6HLphCms2BMCD3DeWtfjePUiTmQHJo6HsQIKP/u4N4Fvee |
137 | ++uMBInei2M4VU74fLXbmKl1F9AEX7JDP3BKSZG19Ch5pnUo4uXM1uNTGsi07P4Y0s |
138 | ++K44+SKBC0bYEFbDK0eQWMrX3kIhkPxyIWhxdq9/NqPYjShuSEAhA6CSpmRg0pqc+ |
139 | ++mA== |
140 | + -----END CERTIFICATE----- |
141 | +diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt |
142 | +index fa4f99493a99..817ecc222c56 100644 |
143 | +--- a/test/net/fixtures/server.crt |
144 | ++++ b/test/net/fixtures/server.crt |
145 | +@@ -1,48 +1,83 @@ |
146 | + Certificate: |
147 | + Data: |
148 | +- Version: 1 (0x0) |
149 | +- Serial Number: 0 (0x0) |
150 | +- Signature Algorithm: sha1WithRSAEncryption |
151 | ++ Version: 3 (0x2) |
152 | ++ Serial Number: 1 (0x1) |
153 | ++ Signature Algorithm: sha256WithRSAEncryption |
154 | + Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
155 | + Validity |
156 | +- Not Before: Jan 3 01:34:17 2014 GMT |
157 | +- Not After : Jan 2 01:34:17 2019 GMT |
158 | +- Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost |
159 | ++ Not Before: Jan 2 03:06:53 2019 GMT |
160 | ++ Not After : Jan 1 03:06:53 2024 GMT |
161 | ++ Subject: C=JP, ST=Shimane, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
162 | + Subject Public Key Info: |
163 | + Public Key Algorithm: rsaEncryption |
164 | +- RSA Public Key: (1024 bit) |
165 | +- Modulus (1024 bit): |
166 | +- 00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6: |
167 | +- bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be: |
168 | +- 9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13: |
169 | +- 9d:7e:eb:a2:06:e2:ea:7d:07:c7:c7:99:c7:fb:d5: |
170 | +- b8:eb:63:77:62:2b:18:12:c3:53:58:d0:f5:c7:40: |
171 | +- 0c:01:d1:26:82:34:16:09:e3:dc:65:f4:dc:bb:5d: |
172 | +- a5:41:60:e7:a9:74:ba:d7:4c:b6:a3:9c:c5:8c:89: |
173 | +- af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6: |
174 | +- d0:fc:d6:eb:fc:06:82:10:fb |
175 | ++ Public-Key: (2048 bit) |
176 | ++ Modulus: |
177 | ++ 00:c1:a9:64:ef:d3:f2:e1:1a:7f:24:df:7f:65:86: |
178 | ++ c1:98:55:16:83:91:16:5b:63:6e:26:bb:c0:73:68: |
179 | ++ 7b:f7:00:ba:37:db:7f:a9:5c:c8:98:aa:43:96:87: |
180 | ++ e1:a0:63:69:0c:d8:22:90:f5:56:22:b1:57:6e:71: |
181 | ++ 3b:30:04:d0:64:4d:38:33:a0:ea:c1:16:3d:16:be: |
182 | ++ c0:49:4c:f0:14:15:af:09:95:da:bf:c7:23:34:c3: |
183 | ++ 7d:af:b7:70:b3:6d:1b:de:21:93:c0:7c:6c:0e:fd: |
184 | ++ 0e:e5:ff:f3:80:51:0c:df:80:7c:40:46:c9:ca:57: |
185 | ++ d4:88:02:0f:f0:1e:14:18:f1:98:0f:c6:42:1d:cc: |
186 | ++ 90:29:71:1b:af:4a:22:e0:e7:86:fc:dd:d3:d8:84: |
187 | ++ 0e:5e:f0:9b:93:5f:0a:9a:1d:f8:f5:f3:e7:c7:b0: |
188 | ++ 7a:0e:25:20:13:02:1a:22:c2:d9:e0:7f:4f:a1:7f: |
189 | ++ 72:f6:e6:e1:14:7c:c5:93:7f:a6:96:3b:ab:d8:f1: |
190 | ++ dc:2b:01:d6:e5:fe:5c:cf:08:db:06:e9:fd:7d:bd: |
191 | ++ fe:2c:f4:8a:7b:9f:15:88:05:2e:f7:ba:c9:86:7e: |
192 | ++ 14:50:f4:96:a1:84:17:5d:f7:8b:0a:7a:14:2c:de: |
193 | ++ ca:00:74:f8:23:32:9d:66:af:1c:a6:58:1a:de:82: |
194 | ++ 96:a9 |
195 | + Exponent: 65537 (0x10001) |
196 | +- Signature Algorithm: sha1WithRSAEncryption |
197 | +- 85:f5:d3:05:8b:8c:f4:43:1c:88:f2:8f:b2:f2:93:77:b7:3d: |
198 | +- 95:c6:a0:34:bc:33:6a:d8:85:5f:3e:86:08:10:c5:5c:c1:76: |
199 | +- a3:53:3c:dc:38:98:23:97:e7:da:21:ac:e8:4d:3c:96:70:29: |
200 | +- ff:ff:1e:4a:9a:17:2b:db:04:62:b9:ef:ab:ea:a7:a5:e8:7c: |
201 | +- b1:d5:ed:30:a8:6c:78:de:51:7e:e3:8a:c2:a4:64:a8:63:a2: |
202 | +- bc:fd:43:9c:f3:55:7d:54:c9:6a:d8:53:1c:4b:6b:03:aa:b6: |
203 | +- 19:e6:a4:4f:47:00:96:c5:42:59:85:4e:c3:4e:cd:41:82:53: |
204 | +- 10:f8 |
205 | ++ X509v3 extensions: |
206 | ++ X509v3 Basic Constraints: |
207 | ++ CA:FALSE |
208 | ++ Netscape Comment: |
209 | ++ OpenSSL Generated Certificate |
210 | ++ X509v3 Subject Key Identifier: |
211 | ++ F2:C9:35:05:31:EF:08:EE:EF:B0:FE:1A:72:C2:9E:70:E3:E3:EC:43 |
212 | ++ X509v3 Authority Key Identifier: |
213 | ++ keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53 |
214 | ++ |
215 | ++ Signature Algorithm: sha256WithRSAEncryption |
216 | ++ 02:e7:0a:22:7c:5e:d9:92:d2:b9:fb:4a:bf:75:3f:00:e6:19: |
217 | ++ 3e:90:a5:9d:38:41:82:4c:6f:b9:f3:f2:58:a1:91:7f:4a:d4: |
218 | ++ 28:38:9c:7c:4d:6c:2f:2f:95:f5:55:55:25:a1:71:0c:05:42: |
219 | ++ 08:a3:a6:ab:e3:04:47:9a:42:24:8f:b2:ba:50:55:af:b8:d7: |
220 | ++ fc:1a:13:92:5d:75:7d:e1:4d:87:5e:57:82:c5:5f:d6:b8:ea: |
221 | ++ 86:4e:05:b0:7f:07:27:a5:36:1f:1e:54:f1:32:35:7f:9c:75: |
222 | ++ 26:6a:21:75:37:32:bb:89:01:78:97:cc:d3:de:3a:e8:ce:45: |
223 | ++ ed:12:24:2e:a8:25:73:b3:cd:70:47:b8:81:f9:06:aa:8d:87: |
224 | ++ 2f:a9:cd:fe:79:40:cc:c9:47:3d:2f:82:c2:82:bf:5d:8a:06: |
225 | ++ 5b:a9:90:d3:b0:a7:fc:f3:1a:fb:0e:cb:8f:d8:f2:4e:f4:8d: |
226 | ++ bb:4b:d5:2d:20:c0:6e:d5:08:2b:81:32:c4:e0:d2:4b:31:27: |
227 | ++ f1:55:96:0e:d4:b9:92:02:71:98:69:e5:73:cc:52:45:a0:07: |
228 | ++ fb:28:9e:b0:fc:b1:58:42:5a:08:4a:30:49:e5:f1:a5:c8:d5: |
229 | ++ 8a:67:f0:ed:9e:3f:1b:71:a6:80:91:81:cb:1a:3d:b5:8e:87: |
230 | ++ 9d:64:28:ce |
231 | + -----BEGIN CERTIFICATE----- |
232 | +-MIICXDCCAcUCAQAwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD |
233 | +-VQQIEwdTaGltYW5lMRQwEgYDVQQHEwtNYXR6LWUgY2l0eTEXMBUGA1UEChMOUnVi |
234 | +-eSBDb3JlIFRlYW0xFTATBgNVBAMTDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ |
235 | +-ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0xNDAxMDMwMTM0MTdaFw0xOTAx |
236 | +-MDIwMTM0MTdaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIEwdTaGltYW5lMRcwFQYD |
237 | +-VQQKEw5SdWJ5IENvcmUgVGVhbTESMBAGA1UECxMJUnVieSBUZXN0MRIwEAYDVQQD |
238 | +-Ewlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANt10EXesd+/ |
239 | +-caAOsKXmvPQcneUlZ2TFe8vxr8a+mqrqfg/MBa/vQGkGsskTnX7rogbi6n0Hx8eZ |
240 | +-x/vVuOtjd2IrGBLDU1jQ9cdADAHRJoI0Fgnj3GX03LtdpUFg56l0utdMtqOcxYyJ |
241 | +-r8vonwX+6v5kJL/n7eP20PzW6/wGghD7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA |
242 | +-hfXTBYuM9EMciPKPsvKTd7c9lcagNLwzatiFXz6GCBDFXMF2o1M83DiYI5fn2iGs |
243 | +-6E08lnAp//8eSpoXK9sEYrnvq+qnpeh8sdXtMKhseN5RfuOKwqRkqGOivP1DnPNV |
244 | +-fVTJathTHEtrA6q2GeakT0cAlsVCWYVOw07NQYJTEPg= |
245 | ++MIID+TCCAuGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx |
246 | ++EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK |
247 | ++DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI |
248 | ++hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMDY1M1oX |
249 | ++DTI0MDEwMTAzMDY1M1owdjELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx |
250 | ++FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex |
251 | ++JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqG |
252 | ++SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBqWTv0/LhGn8k339lhsGYVRaDkRZbY24m |
253 | ++u8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVducTswBNBkTTgzoOrBFj0W |
254 | ++vsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l//OAUQzfgHxARsnKV9SI |
255 | ++Ag/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuTXwqaHfj18+fHsHoOJSAT |
256 | ++Ahoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzPCNsG6f19vf4s9Ip7nxWI |
257 | ++BS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxymWBregpapAgMBAAGjezB5 |
258 | ++MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENl |
259 | ++cnRpZmljYXRlMB0GA1UdDgQWBBTyyTUFMe8I7u+w/hpywp5w4+PsQzAfBgNVHSME |
260 | ++GDAWgBT20SIp1T0j116tDJzmdY+dzfidUzANBgkqhkiG9w0BAQsFAAOCAQEAAucK |
261 | ++Inxe2ZLSuftKv3U/AOYZPpClnThBgkxvufPyWKGRf0rUKDicfE1sLy+V9VVVJaFx |
262 | ++DAVCCKOmq+MER5pCJI+yulBVr7jX/BoTkl11feFNh15XgsVf1rjqhk4FsH8HJ6U2 |
263 | ++Hx5U8TI1f5x1JmohdTcyu4kBeJfM09466M5F7RIkLqglc7PNcEe4gfkGqo2HL6nN |
264 | ++/nlAzMlHPS+CwoK/XYoGW6mQ07Cn/PMa+w7Lj9jyTvSNu0vVLSDAbtUIK4EyxODS |
265 | ++SzEn8VWWDtS5kgJxmGnlc8xSRaAH+yiesPyxWEJaCEowSeXxpcjVimfw7Z4/G3Gm |
266 | ++gJGByxo9tY6HnWQozg== |
267 | + -----END CERTIFICATE----- |
268 | +diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key |
269 | +index 7c57546eceae..1e732327288d 100644 |
270 | +--- a/test/net/fixtures/server.key |
271 | ++++ b/test/net/fixtures/server.key |
272 | +@@ -1,15 +1,28 @@ |
273 | +------BEGIN RSA PRIVATE KEY----- |
274 | +-MIICXQIBAAKBgQDbddBF3rHfv3GgDrCl5rz0HJ3lJWdkxXvL8a/Gvpqq6n4PzAWv |
275 | +-70BpBrLJE51+66IG4up9B8fHmcf71bjrY3diKxgSw1NY0PXHQAwB0SaCNBYJ49xl |
276 | +-9Ny7XaVBYOepdLrXTLajnMWMia/L6J8F/ur+ZCS/5+3j9tD81uv8BoIQ+wIDAQAB |
277 | +-AoGAGtYHR+P5gFDaxiXFuCPFC1zMeg7e29XCU6gURIteQnQ2QhxCvcbV64HkLu51 |
278 | +-HeYWhB0Pa4aeCWxmpgb2e+JH4MEoIjeJSGyZQeqwkQLgWJDdvkgWx5am58QzA60I |
279 | +-ipkZ9QHcPffSs5RiGx4yfr58KqAmwFphGCY8W7v4LqaENdECQQD9H5VTW9g4gj1c |
280 | +-j3uNYvSI/D7a9P7gfI+ziczuwMm5xsBx3D/t5TAr3SJKNne3sl1E6ZERCUbzxf+C |
281 | +-k58EiHx1AkEA3fRLGqDOq7EcQhbjTcA/v/t5MwlGEUsS9+XrqOWn50YuoIwRZJ3v |
282 | +-qHRQzfQfFNklGtfBvwQ4md3irXjMeGVprwJBAMEAuwiDiHuV+xm/ofKtmE13IKot |
283 | +-ksYy1BOOp/8IawhHXueyi+BmF/PqOkIiA+jCjNGF0oIN89beizPSQbbgJx0CQG/K |
284 | +-qL1bu1ys0y/SeWBi8XkP/0aeaCUzq/UiYCTsrzoEll2UzvnftqMhGsXxLGqCyHaR |
285 | +-r2s3hA6zvIVlL4+AfM8CQQClq+WDrC5VKciLYakZNWJjV1m+H2Ut/0fXdUjKHajE |
286 | +-FWLcsrOhADf6bkTb71GwPxnKRkkRmud5upP0ZYYTqM4X |
287 | +------END RSA PRIVATE KEY----- |
288 | ++-----BEGIN PRIVATE KEY----- |
289 | ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBqWTv0/LhGn8k |
290 | ++339lhsGYVRaDkRZbY24mu8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVdu |
291 | ++cTswBNBkTTgzoOrBFj0WvsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l |
292 | ++//OAUQzfgHxARsnKV9SIAg/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuT |
293 | ++XwqaHfj18+fHsHoOJSATAhoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzP |
294 | ++CNsG6f19vf4s9Ip7nxWIBS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxym |
295 | ++WBregpapAgMBAAECggEAYQJ20oBMcSBxwknGqlfnkGRHI97A4UScgACa9fTH7EJM |
296 | ++BgEJIRCeV4Mq2jP0/P/vNoTqQ8zxue02C9fiuzoeHbBkz8/y6Ig4T7V74vwMYzM9 |
297 | ++fEK50klxxFONGUF9zhOA2zPcrJZnFtcC6InfM07mcOsO0q/jE14N05ec3j5i+N7j |
298 | ++hDHsHjS3hUiSEGra/U6TRGA26imDUZR5S3h3WMuFmpQgAg0STHc2inYjS9iVhn+T |
299 | ++uAV2igYR89MOTcH1ZVoxjeYXwhqjWT6Kbw4Er4TWTVzwGf9ktv04EjZjhgUAqw7Q |
300 | ++8Sc7Olt2q2tA7hQqdgJVgNMaszHqpKAECbAfuxuDtQKBgQD/r0zI9ZcTDQOgezaB |
301 | ++s9UGbT5O5LruxLc/ExHRL7gpU7UsF/cc3Hp9zmDrzuUsq+UZlGewNnPBLHzaEq1z |
302 | ++AZD9aa85umzXxcLzyg9ZnvN4kHLKIXhnnTEiShHtpRbqfybBKM7J+iQxXIYUf5tl |
303 | ++lHTfEqG2/nTt4E50dhniIbIaAwKBgQDB5oS3LGXSn6zAWyUsAJaSeS8/3/O4Vz+x |
304 | ++u8tZrICSFWBodwg46eHR9I379eayKhMGCsaAWx4ybWJWWEb/nM+fBGxBSnxb9jmm |
305 | ++gHu93BQjK3sWS8qAGTwO5ehLEy0QRcCc+wb0lyo9hfh1grJioESVsiB9SXrxp8dr |
306 | ++45JvxCCC4wKBgDGSKQ7lHm8hHMzmVoD6/pgKYgQlsGBOX0CpT9EAsXHBuuRbmRtN |
307 | ++W6o8cuoE6MWqZfZ5oUi2peaT23jkGiCr8xJOhRxqGmQTAWMGj8dOW+HKD5dEufVM |
308 | ++spP1TFiIo1K/aCIW6VCbYJz5VT1wKA6fo7EECbpSxxS/YjaOFyKSaddFAoGBAKk3 |
309 | ++bdcVrf70TqTIZlZSZRWLIMsTvPTBX9rSUxL9Um8qrKo+RzS0F9lNHaQn457UzSlW |
310 | ++uglGe8HyaAGGpN9qkF7sUzVftcvjxEgklNkKeaB/z7mThzPn0dwGlIUARTGQThox |
311 | ++kM5gJgLvKfgTiW49A93ISEZOnDbM/2KOhjt35A+VAoGAYsNAMBwjubVo0v1vqry+ |
312 | ++XG6VvPpgVjMiDQCsTEEcBqgRRuf6R5zndIhIvwmTNiUkGkE3w/vG0uCjtB82/kwE |
313 | ++bzVheR0vZDN7s52OYRz4j0ddtYCqGSkvkWuEQfQFZUDTyLodwVQAT5aR+mcr4Qml |
314 | ++uCiVeqoPl+JIg4m8Tz76XWo= |
315 | ++-----END PRIVATE KEY----- |
316 | diff --git a/debian/patches/update-cert-2.patch b/debian/patches/update-cert-2.patch |
317 | new file mode 100644 |
318 | index 0000000..89b4902 |
319 | --- /dev/null |
320 | +++ b/debian/patches/update-cert-2.patch |
321 | @@ -0,0 +1,219 @@ |
322 | +From 1e0b49a293d3792826c67b7e05c5fcbd09c9ea6e Mon Sep 17 00:00:00 2001 |
323 | +From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> |
324 | +Date: Wed, 2 Jan 2019 03:29:01 +0000 |
325 | +Subject: [PATCH] Try to update cert (2nd try) |
326 | +Origin: https://github.com/ruby/ruby/commit/1e0b49a293d3792826c67b7e05c5fcbd09c9ea6e |
327 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby2.5/+bug/1812669 |
328 | +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919516 |
329 | +Last-Update: 2019-01-21 |
330 | + |
331 | +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e |
332 | +--- |
333 | + test/net/fixtures/server.crt | 115 +++++++++++++++++------------------ |
334 | + test/net/fixtures/server.key | 52 ++++++++-------- |
335 | + 2 files changed, 83 insertions(+), 84 deletions(-) |
336 | + |
337 | +diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt |
338 | +index 817ecc222c56..5ca78a6d146a 100644 |
339 | +--- a/test/net/fixtures/server.crt |
340 | ++++ b/test/net/fixtures/server.crt |
341 | +@@ -1,35 +1,35 @@ |
342 | + Certificate: |
343 | + Data: |
344 | + Version: 3 (0x2) |
345 | +- Serial Number: 1 (0x1) |
346 | ++ Serial Number: 2 (0x2) |
347 | + Signature Algorithm: sha256WithRSAEncryption |
348 | + Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
349 | + Validity |
350 | +- Not Before: Jan 2 03:06:53 2019 GMT |
351 | +- Not After : Jan 1 03:06:53 2024 GMT |
352 | +- Subject: C=JP, ST=Shimane, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
353 | ++ Not Before: Jan 2 03:27:13 2019 GMT |
354 | ++ Not After : Jan 1 03:27:13 2024 GMT |
355 | ++ Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost |
356 | + Subject Public Key Info: |
357 | + Public Key Algorithm: rsaEncryption |
358 | + Public-Key: (2048 bit) |
359 | + Modulus: |
360 | +- 00:c1:a9:64:ef:d3:f2:e1:1a:7f:24:df:7f:65:86: |
361 | +- c1:98:55:16:83:91:16:5b:63:6e:26:bb:c0:73:68: |
362 | +- 7b:f7:00:ba:37:db:7f:a9:5c:c8:98:aa:43:96:87: |
363 | +- e1:a0:63:69:0c:d8:22:90:f5:56:22:b1:57:6e:71: |
364 | +- 3b:30:04:d0:64:4d:38:33:a0:ea:c1:16:3d:16:be: |
365 | +- c0:49:4c:f0:14:15:af:09:95:da:bf:c7:23:34:c3: |
366 | +- 7d:af:b7:70:b3:6d:1b:de:21:93:c0:7c:6c:0e:fd: |
367 | +- 0e:e5:ff:f3:80:51:0c:df:80:7c:40:46:c9:ca:57: |
368 | +- d4:88:02:0f:f0:1e:14:18:f1:98:0f:c6:42:1d:cc: |
369 | +- 90:29:71:1b:af:4a:22:e0:e7:86:fc:dd:d3:d8:84: |
370 | +- 0e:5e:f0:9b:93:5f:0a:9a:1d:f8:f5:f3:e7:c7:b0: |
371 | +- 7a:0e:25:20:13:02:1a:22:c2:d9:e0:7f:4f:a1:7f: |
372 | +- 72:f6:e6:e1:14:7c:c5:93:7f:a6:96:3b:ab:d8:f1: |
373 | +- dc:2b:01:d6:e5:fe:5c:cf:08:db:06:e9:fd:7d:bd: |
374 | +- fe:2c:f4:8a:7b:9f:15:88:05:2e:f7:ba:c9:86:7e: |
375 | +- 14:50:f4:96:a1:84:17:5d:f7:8b:0a:7a:14:2c:de: |
376 | +- ca:00:74:f8:23:32:9d:66:af:1c:a6:58:1a:de:82: |
377 | +- 96:a9 |
378 | ++ 00:e8:da:9c:01:2e:2b:10:ec:49:cd:5e:07:13:07: |
379 | ++ 9c:70:9e:c6:74:bc:13:c2:e1:6f:c6:82:fd:e3:48: |
380 | ++ e0:2c:a5:68:c7:9e:42:de:60:54:65:e6:6a:14:57: |
381 | ++ 7a:30:d0:cc:b5:b6:d9:c3:d2:df:c9:25:97:54:67: |
382 | ++ cf:f6:be:5e:cb:8b:ee:03:c5:e1:e2:f9:e7:f7:d1: |
383 | ++ 0c:47:f0:b8:da:33:5a:ad:41:ad:e7:b5:a2:7b:b7: |
384 | ++ bf:30:da:60:f8:e3:54:a2:bc:3a:fd:1b:74:d9:dc: |
385 | ++ 74:42:e9:29:be:df:ac:b4:4f:eb:32:f4:06:f1:e1: |
386 | ++ 8c:4b:a8:8b:fb:29:e7:b1:bf:1d:01:ee:73:0f:f9: |
387 | ++ 40:dc:d5:15:79:d9:c6:73:d0:c0:dd:cb:e4:da:19: |
388 | ++ 47:80:c6:14:04:72:fd:9a:7c:8f:11:82:76:49:04: |
389 | ++ 79:cc:f2:5c:31:22:95:13:3e:5d:40:a6:4d:e0:a3: |
390 | ++ 02:26:7d:52:3b:bb:ed:65:a1:0f:ed:6b:b0:3c:d4: |
391 | ++ de:61:15:5e:d3:dd:68:09:9f:4a:57:a5:c2:a9:6d: |
392 | ++ 86:92:c5:f4:a4:d4:b7:13:3b:52:63:24:05:e2:cc: |
393 | ++ e3:8a:3c:d4:35:34:2b:10:bb:58:72:e7:e1:8d:1d: |
394 | ++ 74:8c:61:16:20:3d:d0:1c:4e:8f:6e:fd:fe:64:10: |
395 | ++ 4f:41 |
396 | + Exponent: 65537 (0x10001) |
397 | + X509v3 extensions: |
398 | + X509v3 Basic Constraints: |
399 | +@@ -37,47 +37,46 @@ Certificate: |
400 | + Netscape Comment: |
401 | + OpenSSL Generated Certificate |
402 | + X509v3 Subject Key Identifier: |
403 | +- F2:C9:35:05:31:EF:08:EE:EF:B0:FE:1A:72:C2:9E:70:E3:E3:EC:43 |
404 | ++ ED:28:C2:7E:AB:4B:C8:E8:FE:55:6D:66:95:31:1C:2D:60:F9:02:36 |
405 | + X509v3 Authority Key Identifier: |
406 | + keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53 |
407 | + |
408 | + Signature Algorithm: sha256WithRSAEncryption |
409 | +- 02:e7:0a:22:7c:5e:d9:92:d2:b9:fb:4a:bf:75:3f:00:e6:19: |
410 | +- 3e:90:a5:9d:38:41:82:4c:6f:b9:f3:f2:58:a1:91:7f:4a:d4: |
411 | +- 28:38:9c:7c:4d:6c:2f:2f:95:f5:55:55:25:a1:71:0c:05:42: |
412 | +- 08:a3:a6:ab:e3:04:47:9a:42:24:8f:b2:ba:50:55:af:b8:d7: |
413 | +- fc:1a:13:92:5d:75:7d:e1:4d:87:5e:57:82:c5:5f:d6:b8:ea: |
414 | +- 86:4e:05:b0:7f:07:27:a5:36:1f:1e:54:f1:32:35:7f:9c:75: |
415 | +- 26:6a:21:75:37:32:bb:89:01:78:97:cc:d3:de:3a:e8:ce:45: |
416 | +- ed:12:24:2e:a8:25:73:b3:cd:70:47:b8:81:f9:06:aa:8d:87: |
417 | +- 2f:a9:cd:fe:79:40:cc:c9:47:3d:2f:82:c2:82:bf:5d:8a:06: |
418 | +- 5b:a9:90:d3:b0:a7:fc:f3:1a:fb:0e:cb:8f:d8:f2:4e:f4:8d: |
419 | +- bb:4b:d5:2d:20:c0:6e:d5:08:2b:81:32:c4:e0:d2:4b:31:27: |
420 | +- f1:55:96:0e:d4:b9:92:02:71:98:69:e5:73:cc:52:45:a0:07: |
421 | +- fb:28:9e:b0:fc:b1:58:42:5a:08:4a:30:49:e5:f1:a5:c8:d5: |
422 | +- 8a:67:f0:ed:9e:3f:1b:71:a6:80:91:81:cb:1a:3d:b5:8e:87: |
423 | +- 9d:64:28:ce |
424 | ++ 1d:b8:c5:8b:72:41:20:65:ad:27:6f:15:63:06:26:12:8d:9c: |
425 | ++ ad:ca:f4:db:97:b4:90:cb:ff:35:94:bb:2a:a7:a1:ab:1e:35: |
426 | ++ 2d:a5:3f:c9:24:b0:1a:58:89:75:3e:81:0a:2c:4f:98:f9:51: |
427 | ++ fb:c0:a3:09:d0:0a:9b:e7:a2:b7:c3:60:40:c8:f4:6d:b2:6a: |
428 | ++ 56:12:17:4c:00:24:31:df:9c:60:ae:b1:68:54:a9:e6:b5:4a: |
429 | ++ 04:e6:92:05:86:d9:5a:dc:96:30:a5:58:de:14:99:0f:e5:15: |
430 | ++ 89:3e:9b:eb:80:e3:bd:83:c3:ea:33:35:4b:3e:2f:d3:0d:64: |
431 | ++ 93:67:7f:8d:f5:3f:0c:27:bc:37:5a:cc:d6:47:16:af:5a:62: |
432 | ++ d2:da:51:f8:74:06:6b:24:ad:28:68:08:98:37:7d:ed:0e:ab: |
433 | ++ 1e:82:61:05:d0:ba:75:a0:ab:21:b0:9a:fd:2b:54:86:1d:0d: |
434 | ++ 1f:c2:d4:77:1f:72:26:5e:ad:8a:9f:09:36:6d:44:be:74:c2: |
435 | ++ 5a:3e:ff:5c:9d:75:d6:38:7b:c5:39:f9:44:6e:a1:d1:8e:ff: |
436 | ++ 63:db:c4:bb:c6:91:92:ca:5c:60:9b:1d:eb:0a:de:08:ee:bf: |
437 | ++ da:76:03:65:62:29:8b:f8:7f:c7:86:73:1e:f6:1f:2d:89:69: |
438 | ++ fd:be:bd:6e |
439 | + -----BEGIN CERTIFICATE----- |
440 | +-MIID+TCCAuGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx |
441 | ++MIID4zCCAsugAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx |
442 | + EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK |
443 | + DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI |
444 | +-hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMDY1M1oX |
445 | +-DTI0MDEwMTAzMDY1M1owdjELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx |
446 | +-FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex |
447 | +-JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqG |
448 | +-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBqWTv0/LhGn8k339lhsGYVRaDkRZbY24m |
449 | +-u8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVducTswBNBkTTgzoOrBFj0W |
450 | +-vsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l//OAUQzfgHxARsnKV9SI |
451 | +-Ag/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuTXwqaHfj18+fHsHoOJSAT |
452 | +-Ahoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzPCNsG6f19vf4s9Ip7nxWI |
453 | +-BS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxymWBregpapAgMBAAGjezB5 |
454 | +-MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENl |
455 | +-cnRpZmljYXRlMB0GA1UdDgQWBBTyyTUFMe8I7u+w/hpywp5w4+PsQzAfBgNVHSME |
456 | +-GDAWgBT20SIp1T0j116tDJzmdY+dzfidUzANBgkqhkiG9w0BAQsFAAOCAQEAAucK |
457 | +-Inxe2ZLSuftKv3U/AOYZPpClnThBgkxvufPyWKGRf0rUKDicfE1sLy+V9VVVJaFx |
458 | +-DAVCCKOmq+MER5pCJI+yulBVr7jX/BoTkl11feFNh15XgsVf1rjqhk4FsH8HJ6U2 |
459 | +-Hx5U8TI1f5x1JmohdTcyu4kBeJfM09466M5F7RIkLqglc7PNcEe4gfkGqo2HL6nN |
460 | +-/nlAzMlHPS+CwoK/XYoGW6mQ07Cn/PMa+w7Lj9jyTvSNu0vVLSDAbtUIK4EyxODS |
461 | +-SzEn8VWWDtS5kgJxmGnlc8xSRaAH+yiesPyxWEJaCEowSeXxpcjVimfw7Z4/G3Gm |
462 | +-gJGByxo9tY6HnWQozg== |
463 | ++hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMjcxM1oX |
464 | ++DTI0MDEwMTAzMjcxM1owYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx |
465 | ++FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ |
466 | ++BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB |
467 | ++AOjanAEuKxDsSc1eBxMHnHCexnS8E8Lhb8aC/eNI4CylaMeeQt5gVGXmahRXejDQ |
468 | ++zLW22cPS38kll1Rnz/a+XsuL7gPF4eL55/fRDEfwuNozWq1Bree1onu3vzDaYPjj |
469 | ++VKK8Ov0bdNncdELpKb7frLRP6zL0BvHhjEuoi/sp57G/HQHucw/5QNzVFXnZxnPQ |
470 | ++wN3L5NoZR4DGFARy/Zp8jxGCdkkEeczyXDEilRM+XUCmTeCjAiZ9Uju77WWhD+1r |
471 | ++sDzU3mEVXtPdaAmfSlelwqlthpLF9KTUtxM7UmMkBeLM44o81DU0KxC7WHLn4Y0d |
472 | ++dIxhFiA90BxOj279/mQQT0ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhC |
473 | ++AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFO0o |
474 | ++wn6rS8jo/lVtZpUxHC1g+QI2MB8GA1UdIwQYMBaAFPbRIinVPSPXXq0MnOZ1j53N |
475 | +++J1TMA0GCSqGSIb3DQEBCwUAA4IBAQAduMWLckEgZa0nbxVjBiYSjZytyvTbl7SQ |
476 | ++y/81lLsqp6GrHjUtpT/JJLAaWIl1PoEKLE+Y+VH7wKMJ0Aqb56K3w2BAyPRtsmpW |
477 | ++EhdMACQx35xgrrFoVKnmtUoE5pIFhtla3JYwpVjeFJkP5RWJPpvrgOO9g8PqMzVL |
478 | ++Pi/TDWSTZ3+N9T8MJ7w3WszWRxavWmLS2lH4dAZrJK0oaAiYN33tDqsegmEF0Lp1 |
479 | ++oKshsJr9K1SGHQ0fwtR3H3ImXq2Knwk2bUS+dMJaPv9cnXXWOHvFOflEbqHRjv9j |
480 | ++28S7xpGSylxgmx3rCt4I7r/adgNlYimL+H/HhnMe9h8tiWn9vr1u |
481 | + -----END CERTIFICATE----- |
482 | +diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key |
483 | +index 1e732327288d..7f2380e71e63 100644 |
484 | +--- a/test/net/fixtures/server.key |
485 | ++++ b/test/net/fixtures/server.key |
486 | +@@ -1,28 +1,28 @@ |
487 | + -----BEGIN PRIVATE KEY----- |
488 | +-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBqWTv0/LhGn8k |
489 | +-339lhsGYVRaDkRZbY24mu8BzaHv3ALo323+pXMiYqkOWh+GgY2kM2CKQ9VYisVdu |
490 | +-cTswBNBkTTgzoOrBFj0WvsBJTPAUFa8Jldq/xyM0w32vt3CzbRveIZPAfGwO/Q7l |
491 | +-//OAUQzfgHxARsnKV9SIAg/wHhQY8ZgPxkIdzJApcRuvSiLg54b83dPYhA5e8JuT |
492 | +-XwqaHfj18+fHsHoOJSATAhoiwtngf0+hf3L25uEUfMWTf6aWO6vY8dwrAdbl/lzP |
493 | +-CNsG6f19vf4s9Ip7nxWIBS73usmGfhRQ9JahhBdd94sKehQs3soAdPgjMp1mrxym |
494 | +-WBregpapAgMBAAECggEAYQJ20oBMcSBxwknGqlfnkGRHI97A4UScgACa9fTH7EJM |
495 | +-BgEJIRCeV4Mq2jP0/P/vNoTqQ8zxue02C9fiuzoeHbBkz8/y6Ig4T7V74vwMYzM9 |
496 | +-fEK50klxxFONGUF9zhOA2zPcrJZnFtcC6InfM07mcOsO0q/jE14N05ec3j5i+N7j |
497 | +-hDHsHjS3hUiSEGra/U6TRGA26imDUZR5S3h3WMuFmpQgAg0STHc2inYjS9iVhn+T |
498 | +-uAV2igYR89MOTcH1ZVoxjeYXwhqjWT6Kbw4Er4TWTVzwGf9ktv04EjZjhgUAqw7Q |
499 | +-8Sc7Olt2q2tA7hQqdgJVgNMaszHqpKAECbAfuxuDtQKBgQD/r0zI9ZcTDQOgezaB |
500 | +-s9UGbT5O5LruxLc/ExHRL7gpU7UsF/cc3Hp9zmDrzuUsq+UZlGewNnPBLHzaEq1z |
501 | +-AZD9aa85umzXxcLzyg9ZnvN4kHLKIXhnnTEiShHtpRbqfybBKM7J+iQxXIYUf5tl |
502 | +-lHTfEqG2/nTt4E50dhniIbIaAwKBgQDB5oS3LGXSn6zAWyUsAJaSeS8/3/O4Vz+x |
503 | +-u8tZrICSFWBodwg46eHR9I379eayKhMGCsaAWx4ybWJWWEb/nM+fBGxBSnxb9jmm |
504 | +-gHu93BQjK3sWS8qAGTwO5ehLEy0QRcCc+wb0lyo9hfh1grJioESVsiB9SXrxp8dr |
505 | +-45JvxCCC4wKBgDGSKQ7lHm8hHMzmVoD6/pgKYgQlsGBOX0CpT9EAsXHBuuRbmRtN |
506 | +-W6o8cuoE6MWqZfZ5oUi2peaT23jkGiCr8xJOhRxqGmQTAWMGj8dOW+HKD5dEufVM |
507 | +-spP1TFiIo1K/aCIW6VCbYJz5VT1wKA6fo7EECbpSxxS/YjaOFyKSaddFAoGBAKk3 |
508 | +-bdcVrf70TqTIZlZSZRWLIMsTvPTBX9rSUxL9Um8qrKo+RzS0F9lNHaQn457UzSlW |
509 | +-uglGe8HyaAGGpN9qkF7sUzVftcvjxEgklNkKeaB/z7mThzPn0dwGlIUARTGQThox |
510 | +-kM5gJgLvKfgTiW49A93ISEZOnDbM/2KOhjt35A+VAoGAYsNAMBwjubVo0v1vqry+ |
511 | +-XG6VvPpgVjMiDQCsTEEcBqgRRuf6R5zndIhIvwmTNiUkGkE3w/vG0uCjtB82/kwE |
512 | +-bzVheR0vZDN7s52OYRz4j0ddtYCqGSkvkWuEQfQFZUDTyLodwVQAT5aR+mcr4Qml |
513 | +-uCiVeqoPl+JIg4m8Tz76XWo= |
514 | ++MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDo2pwBLisQ7EnN |
515 | ++XgcTB5xwnsZ0vBPC4W/Ggv3jSOAspWjHnkLeYFRl5moUV3ow0My1ttnD0t/JJZdU |
516 | ++Z8/2vl7Li+4DxeHi+ef30QxH8LjaM1qtQa3ntaJ7t78w2mD441SivDr9G3TZ3HRC |
517 | ++6Sm+36y0T+sy9Abx4YxLqIv7Keexvx0B7nMP+UDc1RV52cZz0MDdy+TaGUeAxhQE |
518 | ++cv2afI8RgnZJBHnM8lwxIpUTPl1Apk3gowImfVI7u+1loQ/ta7A81N5hFV7T3WgJ |
519 | ++n0pXpcKpbYaSxfSk1LcTO1JjJAXizOOKPNQ1NCsQu1hy5+GNHXSMYRYgPdAcTo9u |
520 | ++/f5kEE9BAgMBAAECggEBAOHkwhc7DLh8IhTDNSW26oMu5OP2WU1jmiYAigDmf+OQ |
521 | ++DBgrZj+JQBci8qINQxL8XLukSZn5hvQCLc7Kbyu1/wyEEUFDxSGGwwzclodr9kho |
522 | ++LX2LDASPZrOSzD2+fPi2wTKmXKuS6Uc44OjQfZkYMNkz9r4Vkm8xGgOD3VipjIYX |
523 | ++QXlhhdqkXZcNABsihCV52GKkDFSVm8jv95YJc5xhoYCy/3a4/qPdF0aT2R7oYUej |
524 | ++hKrxVDskyooe8Zg/JTydZNV5GQEDmW01/K3r6XGT26oPi1AqMU1gtv/jkW56CRQQ |
525 | ++1got8smnqM+AV7Slf9R6DauIPdQJ2S8wsr/o8ISBsOECgYEA9YrqEP2gAYSGFXRt |
526 | ++liw0WI2Ant8BqXS6yvq1jLo/qWhLw/ph4Di73OQ2mpycVTpgfGr2wFPQR1XJ+0Fd |
527 | ++U+Ir/C3Q7FK4VIGHK7B0zNvZr5tEjlFfeRezo2JMVw5YWeSagIFcSwK+KqCTH9qc |
528 | ++pw/Eb8nB/4XNcpTZu7Fg0Wc+ooUCgYEA8sVaicn1Wxkpb45a4qfrA6wOr5xdJ4cC |
529 | ++A5qs7vjX2OdPIQOmoQhdI7bCWFXZzF33wA4YCws6j5wRaySLIJqdms8Gl9QnODy1 |
530 | ++ZlA5gwKToBC/jqPmWAXSKb8EH7cHilaxU9OKnQ7CfwlGLHqjMtjrhR7KHlt3CVRs |
531 | ++oRmvsjZVXI0CgYAmPedslAO6mMhFSSfULrhMXmV82OCqYrrA6EEkVNGbcdnzAOkD |
532 | ++gfKIWabDd8bFY10po4Mguy0CHzNhBXIioWQWV5BlbhC1YKMLw+S9DzSdLAKGY9gJ |
533 | ++xQ4+UQ3wtRQ/k+IYR413RUsW2oFvgZ3KSyNeAb9MK6uuv84VdG/OzVSs/QKBgQDn |
534 | ++kap//l2EbObiWyaERunckdVcW0lcN+KK75J/TGwPoOwQsLvTpPe65kxRGGrtDsEQ |
535 | ++uCDk/+v3KkZPLgdrrTAih9FhJ+PVN8tMcb+6IM4SA4fFFr/UPJEwct0LJ3oQ0grJ |
536 | ++y+HPWFHb/Uurh7t99/4H98uR02sjQh1wOeEmm78mzQKBgQDm+LzGH0se6CXQ6cdZ |
537 | ++g1JRZeXkDEsrW3hfAsW62xJQmXcWxBoblP9OamMY+A06rM5og3JbDk5Zm6JsOaA8 |
538 | ++wS2gw4ilp46jors4eQey8ux7kB9LzdBoDBBElnsbjLO8oBNZlVcYXg+6BOl/CUi7 |
539 | ++2whRF0FEjKA8ehrNhAq+VFfFNw== |
540 | + -----END PRIVATE KEY----- |
lgtm