Merge ~adrien/ubuntu/+source/ruby3.1:replace-expired-certificate into ubuntu/+source/ruby3.1:ubuntu/devel
- Git
- lp:~adrien/ubuntu/+source/ruby3.1
- replace-expired-certificate
- Merge into ubuntu/devel
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 729971ec5db5c602928188c67b7fd54e2ecbc73a | ||||
Proposed branch: | ~adrien/ubuntu/+source/ruby3.1:replace-expired-certificate | ||||
Merge into: | ubuntu/+source/ruby3.1:ubuntu/devel | ||||
Diff against target: |
292 lines (+270/-0) 3 files modified
debian/changelog (+7/-0) debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch (+260/-0) debian/patches/series (+3/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Durigan Junior (community) | Approve | ||
git-ubuntu import | Pending | ||
Ubuntu Sponsors | Pending | ||
Review via email: mp+459521@code.launchpad.net |
This proposal supersedes a proposal from 2024-01-19.
Commit message
Description of the change
Update expired test certificates.
Sergio Durigan Junior (sergiodj) wrote : Posted in a previous version of this proposal | # |
Adrien Nader (adrien) wrote : Posted in a previous version of this proposal | # |
Hi Sergio,
I've updated the merge requests. Sorry about the DEP-3 headers: I had put them in a previous "iteration" of the patch and subsequently lost them because there were several patches floating upstream in parallel. On the positive side, I noticed a specific merge of this change in the 3.1 branch upstream and was able to use the exact same commit hash now.
There is an upstream bug for this: Bug: https:/
(I hadn't noticed it the previously)
But no ubuntu bug. I noticed this because of failing tests for migration (either of gnutls28 or of openssl, I don't remember).
As for the use of "merge", I can't see find where I used that. In any case, this is a patch from upstream, now present in 3.1, 3.2, and 3.3 branches but only released through the 3.2 branch. I'm reusing it without any change.
Adrien Nader (adrien) wrote : Posted in a previous version of this proposal | # |
Forgot to mention there is a PPA at https:/
Admittedly, the package dates back to the original submission of this bug and the patch lacked DEP-3 headers but the updated package also built locally and since it's Friday evening, LP won't publish builds before the end of the week.
Simon Chopin (schopin) wrote : Posted in a previous version of this proposal | # |
Not planning on sponsoring this, but regarding the lack of bug, it's a good idea in general to file LP bugs for a simple reason: they're a stable reference to get context when examining your system (e.g. d/changelog is present on the user's system whereas the git-ubuntu history isn't). In this case it would also have allowed you to tag the bug as `update-excuse` as it seems to be relevant for -proposed migrations.
Adrien Nader (adrien) wrote : Posted in a previous version of this proposal | # |
I can create an LP bug and re-spin the patch but not before Monday.
(and I was expecting this to be quicker and with less migration impact)
Sergio Durigan Junior (sergiodj) wrote : | # |
Thanks, Adrien.
Uploaded:
$ dput ruby3.1_
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/
Checking signature on .dsc
gpg: /home/sergio/
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading ruby3.1_
Uploading ruby3.1_
Uploading ruby3.1_
Uploading ruby3.1_
Successfully uploaded packages.
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 75aabc4..bcf5b32 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,10 @@ |
6 | +ruby3.1 (3.1.2-7ubuntu4) noble; urgency=medium |
7 | + |
8 | + * Replace expired certificate in tests with upstream patch (LP: #2051380) |
9 | + - renew-test-certificates-d3933fc753187a055a4904af82f5f3794c88c416.patch |
10 | + |
11 | + -- Adrien Nader <adrien.nader@canonical.com> Fri, 26 Jan 2024 18:00:42 +0100 |
12 | + |
13 | ruby3.1 (3.1.2-7ubuntu3) mantic; urgency=medium |
14 | |
15 | * Mark strlcat strlcpy as optional, since they are now part of glibc |
16 | diff --git a/debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch b/debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch |
17 | new file mode 100644 |
18 | index 0000000..ab74b12 |
19 | --- /dev/null |
20 | +++ b/debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch |
21 | @@ -0,0 +1,260 @@ |
22 | +From 844672256e8e843a7e3a52b7e3c9bb8ea4c328b4 Mon Sep 17 00:00:00 2001 |
23 | +From: Sorah Fukumori <her@sorah.jp> |
24 | +Date: Mon, 1 Jan 2024 20:45:54 +0900 |
25 | +Subject: [PATCH] [ruby/net-http] Renew test certificates |
26 | + |
27 | +The private key is replaced with a public known test key published at |
28 | +[RFC 9500]. |
29 | + |
30 | +Also lifetime has been extended to 10 years from 4 years. |
31 | + |
32 | +[RFC 9500]: https://www.rfc-editor.org/rfc/rfc9500.html |
33 | + |
34 | +https://github.com/ruby/net-http/commit/4ab6c4a500 |
35 | +Applied-Upstream: 3.1.5 (expected), 3.2.3, 3.3.1 (expected) |
36 | +Bug: https://bugs.ruby-lang.org/issues/20106 |
37 | +Origin: upstream, https://github.com/ruby/ruby/pull/9420/commits/844672256e8e843a7e3a52b7e3c9bb8ea4c328b4 |
38 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby3.1/+bug/2051380 |
39 | +--- |
40 | + test/net/fixtures/Makefile | 6 +-- |
41 | + test/net/fixtures/cacert.pem | 44 ++++++++-------- |
42 | + test/net/fixtures/server.crt | 99 +++++++----------------------------- |
43 | + test/net/fixtures/server.key | 55 ++++++++++---------- |
44 | + 4 files changed, 71 insertions(+), 133 deletions(-) |
45 | + |
46 | +diff --git a/test/net/fixtures/Makefile b/test/net/fixtures/Makefile |
47 | +index b2bc9c7368ee2e..88c232e3b6c16b 100644 |
48 | +--- a/test/net/fixtures/Makefile |
49 | ++++ b/test/net/fixtures/Makefile |
50 | +@@ -5,11 +5,11 @@ regen_certs: |
51 | + make server.crt |
52 | + |
53 | + cacert.pem: server.key |
54 | +- openssl req -new -x509 -days 1825 -key server.key -out cacert.pem -text -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org" |
55 | ++ openssl req -new -x509 -days 3650 -key server.key -out cacert.pem -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org" |
56 | + |
57 | + server.csr: |
58 | +- openssl req -new -key server.key -out server.csr -text -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost" |
59 | ++ openssl req -new -key server.key -out server.csr -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost" |
60 | + |
61 | + server.crt: server.csr cacert.pem |
62 | +- openssl x509 -days 1825 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -text -out server.crt |
63 | ++ openssl x509 -days 3650 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -out server.crt |
64 | + rm server.csr |
65 | +diff --git a/test/net/fixtures/cacert.pem b/test/net/fixtures/cacert.pem |
66 | +index f623bd62ed3758..24c83f1c652253 100644 |
67 | +--- a/test/net/fixtures/cacert.pem |
68 | ++++ b/test/net/fixtures/cacert.pem |
69 | +@@ -1,24 +1,24 @@ |
70 | + -----BEGIN CERTIFICATE----- |
71 | +-MIID7TCCAtWgAwIBAgIJAIltvxrFAuSnMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD |
72 | +-VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx |
73 | +-FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex |
74 | +-JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTkwMTAy |
75 | +-MDI1ODI4WhcNMjQwMTAxMDI1ODI4WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM |
76 | +-B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv |
77 | +-cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz |
78 | +-ZWN1cml0eUBydWJ5LWxhbmcub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB |
79 | +-CgKCAQEAznlbjRVhz1NlutHVrhcGnK8W0qug2ujKXv1njSC4U6nJF6py7I9EeehV |
80 | +-SaKePyv+I9z3K1LnfUHOtUbdwdKC77yN66A6q2aqzu5q09/NSykcZGOIF0GuItYI |
81 | +-3nvW3IqBddff2ffsyR+9pBjfb5AIPP08WowF9q4s1eGULwZc4w2B8PFhtxYANd7d |
82 | +-BvGLXFlcufv9tDtzyRi4t7eqxCRJkZQIZNZ6DHHIJrNxejOILfHLarI12yk8VK6L |
83 | +-2LG4WgGqyeePiRyd1o1MbuiAFYqAwpXNUbRKg5NaZGwBHZk8UZ+uFKt1QMBURO5R |
84 | +-WFy1c349jbWszTqFyL4Lnbg9HhAowQIDAQABo1AwTjAdBgNVHQ4EFgQU9tEiKdU9 |
85 | +-I9derQyc5nWPnc34nVMwHwYDVR0jBBgwFoAU9tEiKdU9I9derQyc5nWPnc34nVMw |
86 | +-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxj7F/u3C3fgq24N7hGRA |
87 | +-of7ClFQxGmo/IGT0AISzW3HiVYiFaikKhbO1NwD9aBpD8Zwe62sCqMh8jGV/b0+q |
88 | +-aOORnWYNy2R6r9FkASAglmdF6xn3bhgGD5ls4pCvcG9FynGnGc24g6MrjFNrBYUS |
89 | +-2iIZsg36i0IJswo/Dy6HLphCms2BMCD3DeWtfjePUiTmQHJo6HsQIKP/u4N4Fvee |
90 | +-uMBInei2M4VU74fLXbmKl1F9AEX7JDP3BKSZG19Ch5pnUo4uXM1uNTGsi07P4Y0s |
91 | +-K44+SKBC0bYEFbDK0eQWMrX3kIhkPxyIWhxdq9/NqPYjShuSEAhA6CSpmRg0pqc+ |
92 | +-mA== |
93 | ++MIID+zCCAuOgAwIBAgIUGMvHl3EhtKPKcgc3NQSAYfFuC+8wDQYJKoZIhvcNAQEL |
94 | ++BQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRQwEgYDVQQHDAtN |
95 | ++YXR6LWUgY2l0eTEXMBUGA1UECgwOUnVieSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1 |
96 | ++YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJARYWc2VjdXJpdHlAcnVieS1sYW5nLm9y |
97 | ++ZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEyMjkxMTQ3MjNaMIGMMQswCQYDVQQGEwJK |
98 | ++UDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkxFzAVBgNV |
99 | ++BAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0ExJTAjBgkq |
100 | ++hkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqGSIb3DQEB |
101 | ++AQUAA4IBDwAwggEKAoIBAQCw+egZQ6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI |
102 | +++1GSqyi1bFBgsRjM0THllIdMbKmJtWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0f |
103 | ++qXmG8UTz0VTWdlAXXmhUs6lSADvAaIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0 |
104 | ++yg+801SXzoFTTa+UGIRLE66jH51aa5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIe |
105 | ++NWMF32wHqIOOPvQcWV3M5D2vxJEj702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1 |
106 | ++JNPc/n3dVUm+fM6NoDXPoLP7j55G9zKyqGtGAWXAj1MTAgMBAAGjUzBRMB0GA1Ud |
107 | ++DgQWBBSJGVleDvFp9cu9R+E0/OKYzGkwkTAfBgNVHSMEGDAWgBSJGVleDvFp9cu9 |
108 | ++R+E0/OKYzGkwkTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBl |
109 | ++8GLB8skAWlkSw/FwbUmEV3zyqu+p7PNP5YIYoZs0D74e7yVulGQ6PKMZH5hrZmHo |
110 | ++orFSQU+VUUirG8nDGj7Rzce8WeWBxsaDGC8CE2dq6nC6LuUwtbdMnBrH0LRWAz48 |
111 | ++jGFF3jHtVz8VsGfoZTZCjukWqNXvU6hETT9GsfU+PZqbqcTVRPH52+XgYayKdIbD |
112 | ++r97RM4X3+aXBHcUW0b76eyyi65RR/Xtvn8ioZt2AdX7T2tZzJyXJN3Hupp77s6Ui |
113 | ++AZR35SToHCZeTZD12YBvLBdaTPLZN7O/Q/aAO9ZiJaZ7SbFOjz813B2hxXab4Fob |
114 | ++2uJX6eMWTVxYK5D4M9lm |
115 | + -----END CERTIFICATE----- |
116 | +diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt |
117 | +index 5ca78a6d146a00..5d2923795dabca 100644 |
118 | +--- a/test/net/fixtures/server.crt |
119 | ++++ b/test/net/fixtures/server.crt |
120 | +@@ -1,82 +1,21 @@ |
121 | +-Certificate: |
122 | +- Data: |
123 | +- Version: 3 (0x2) |
124 | +- Serial Number: 2 (0x2) |
125 | +- Signature Algorithm: sha256WithRSAEncryption |
126 | +- Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org |
127 | +- Validity |
128 | +- Not Before: Jan 2 03:27:13 2019 GMT |
129 | +- Not After : Jan 1 03:27:13 2024 GMT |
130 | +- Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost |
131 | +- Subject Public Key Info: |
132 | +- Public Key Algorithm: rsaEncryption |
133 | +- Public-Key: (2048 bit) |
134 | +- Modulus: |
135 | +- 00:e8:da:9c:01:2e:2b:10:ec:49:cd:5e:07:13:07: |
136 | +- 9c:70:9e:c6:74:bc:13:c2:e1:6f:c6:82:fd:e3:48: |
137 | +- e0:2c:a5:68:c7:9e:42:de:60:54:65:e6:6a:14:57: |
138 | +- 7a:30:d0:cc:b5:b6:d9:c3:d2:df:c9:25:97:54:67: |
139 | +- cf:f6:be:5e:cb:8b:ee:03:c5:e1:e2:f9:e7:f7:d1: |
140 | +- 0c:47:f0:b8:da:33:5a:ad:41:ad:e7:b5:a2:7b:b7: |
141 | +- bf:30:da:60:f8:e3:54:a2:bc:3a:fd:1b:74:d9:dc: |
142 | +- 74:42:e9:29:be:df:ac:b4:4f:eb:32:f4:06:f1:e1: |
143 | +- 8c:4b:a8:8b:fb:29:e7:b1:bf:1d:01:ee:73:0f:f9: |
144 | +- 40:dc:d5:15:79:d9:c6:73:d0:c0:dd:cb:e4:da:19: |
145 | +- 47:80:c6:14:04:72:fd:9a:7c:8f:11:82:76:49:04: |
146 | +- 79:cc:f2:5c:31:22:95:13:3e:5d:40:a6:4d:e0:a3: |
147 | +- 02:26:7d:52:3b:bb:ed:65:a1:0f:ed:6b:b0:3c:d4: |
148 | +- de:61:15:5e:d3:dd:68:09:9f:4a:57:a5:c2:a9:6d: |
149 | +- 86:92:c5:f4:a4:d4:b7:13:3b:52:63:24:05:e2:cc: |
150 | +- e3:8a:3c:d4:35:34:2b:10:bb:58:72:e7:e1:8d:1d: |
151 | +- 74:8c:61:16:20:3d:d0:1c:4e:8f:6e:fd:fe:64:10: |
152 | +- 4f:41 |
153 | +- Exponent: 65537 (0x10001) |
154 | +- X509v3 extensions: |
155 | +- X509v3 Basic Constraints: |
156 | +- CA:FALSE |
157 | +- Netscape Comment: |
158 | +- OpenSSL Generated Certificate |
159 | +- X509v3 Subject Key Identifier: |
160 | +- ED:28:C2:7E:AB:4B:C8:E8:FE:55:6D:66:95:31:1C:2D:60:F9:02:36 |
161 | +- X509v3 Authority Key Identifier: |
162 | +- keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53 |
163 | +- |
164 | +- Signature Algorithm: sha256WithRSAEncryption |
165 | +- 1d:b8:c5:8b:72:41:20:65:ad:27:6f:15:63:06:26:12:8d:9c: |
166 | +- ad:ca:f4:db:97:b4:90:cb:ff:35:94:bb:2a:a7:a1:ab:1e:35: |
167 | +- 2d:a5:3f:c9:24:b0:1a:58:89:75:3e:81:0a:2c:4f:98:f9:51: |
168 | +- fb:c0:a3:09:d0:0a:9b:e7:a2:b7:c3:60:40:c8:f4:6d:b2:6a: |
169 | +- 56:12:17:4c:00:24:31:df:9c:60:ae:b1:68:54:a9:e6:b5:4a: |
170 | +- 04:e6:92:05:86:d9:5a:dc:96:30:a5:58:de:14:99:0f:e5:15: |
171 | +- 89:3e:9b:eb:80:e3:bd:83:c3:ea:33:35:4b:3e:2f:d3:0d:64: |
172 | +- 93:67:7f:8d:f5:3f:0c:27:bc:37:5a:cc:d6:47:16:af:5a:62: |
173 | +- d2:da:51:f8:74:06:6b:24:ad:28:68:08:98:37:7d:ed:0e:ab: |
174 | +- 1e:82:61:05:d0:ba:75:a0:ab:21:b0:9a:fd:2b:54:86:1d:0d: |
175 | +- 1f:c2:d4:77:1f:72:26:5e:ad:8a:9f:09:36:6d:44:be:74:c2: |
176 | +- 5a:3e:ff:5c:9d:75:d6:38:7b:c5:39:f9:44:6e:a1:d1:8e:ff: |
177 | +- 63:db:c4:bb:c6:91:92:ca:5c:60:9b:1d:eb:0a:de:08:ee:bf: |
178 | +- da:76:03:65:62:29:8b:f8:7f:c7:86:73:1e:f6:1f:2d:89:69: |
179 | +- fd:be:bd:6e |
180 | + -----BEGIN CERTIFICATE----- |
181 | +-MIID4zCCAsugAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx |
182 | +-EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK |
183 | +-DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI |
184 | +-hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMjcxM1oX |
185 | +-DTI0MDEwMTAzMjcxM1owYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx |
186 | +-FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ |
187 | +-BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB |
188 | +-AOjanAEuKxDsSc1eBxMHnHCexnS8E8Lhb8aC/eNI4CylaMeeQt5gVGXmahRXejDQ |
189 | +-zLW22cPS38kll1Rnz/a+XsuL7gPF4eL55/fRDEfwuNozWq1Bree1onu3vzDaYPjj |
190 | +-VKK8Ov0bdNncdELpKb7frLRP6zL0BvHhjEuoi/sp57G/HQHucw/5QNzVFXnZxnPQ |
191 | +-wN3L5NoZR4DGFARy/Zp8jxGCdkkEeczyXDEilRM+XUCmTeCjAiZ9Uju77WWhD+1r |
192 | +-sDzU3mEVXtPdaAmfSlelwqlthpLF9KTUtxM7UmMkBeLM44o81DU0KxC7WHLn4Y0d |
193 | +-dIxhFiA90BxOj279/mQQT0ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhC |
194 | +-AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFO0o |
195 | +-wn6rS8jo/lVtZpUxHC1g+QI2MB8GA1UdIwQYMBaAFPbRIinVPSPXXq0MnOZ1j53N |
196 | +-+J1TMA0GCSqGSIb3DQEBCwUAA4IBAQAduMWLckEgZa0nbxVjBiYSjZytyvTbl7SQ |
197 | +-y/81lLsqp6GrHjUtpT/JJLAaWIl1PoEKLE+Y+VH7wKMJ0Aqb56K3w2BAyPRtsmpW |
198 | +-EhdMACQx35xgrrFoVKnmtUoE5pIFhtla3JYwpVjeFJkP5RWJPpvrgOO9g8PqMzVL |
199 | +-Pi/TDWSTZ3+N9T8MJ7w3WszWRxavWmLS2lH4dAZrJK0oaAiYN33tDqsegmEF0Lp1 |
200 | +-oKshsJr9K1SGHQ0fwtR3H3ImXq2Knwk2bUS+dMJaPv9cnXXWOHvFOflEbqHRjv9j |
201 | +-28S7xpGSylxgmx3rCt4I7r/adgNlYimL+H/HhnMe9h8tiWn9vr1u |
202 | ++MIIDYTCCAkkCAQAwDQYJKoZIhvcNAQELBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD |
203 | ++VQQIDAdTaGltYW5lMRQwEgYDVQQHDAtNYXR6LWUgY2l0eTEXMBUGA1UECgwOUnVi |
204 | ++eSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ |
205 | ++ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEy |
206 | ++MjkxMTQ3MjNaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRcwFQYD |
207 | ++VQQKDA5SdWJ5IENvcmUgVGVhbTESMBAGA1UECwwJUnVieSBUZXN0MRIwEAYDVQQD |
208 | ++DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+egZ |
209 | ++Q6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI+1GSqyi1bFBgsRjM0THllIdMbKmJ |
210 | ++tWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0fqXmG8UTz0VTWdlAXXmhUs6lSADvA |
211 | ++aIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0yg+801SXzoFTTa+UGIRLE66jH51a |
212 | ++a5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIeNWMF32wHqIOOPvQcWV3M5D2vxJEj |
213 | ++702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1JNPc/n3dVUm+fM6NoDXPoLP7j55G |
214 | ++9zKyqGtGAWXAj1MTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACtGNdj5TEtnJBYp |
215 | ++M+LhBeU3oNteldfycEm993gJp6ghWZFg23oX8fVmyEeJr/3Ca9bAgDqg0t9a0npN |
216 | ++oWKEY6wVKqcHgu3gSvThF5c9KhGbeDDmlTSVVNQmXWX0K2d4lS2cwZHH8mCm2mrY |
217 | ++PDqlEkSc7k4qSiqigdS8i80Yk+lDXWsm8CjsiC93qaRM7DnS0WPQR0c16S95oM6G |
218 | ++VklFKUSDAuFjw9aVWA/nahOucjn0w5fVW6lyIlkBslC1ChlaDgJmvhz+Ol3iMsE0 |
219 | ++kAmFNu2KKPVrpMWaBID49QwQTDyhetNLaVVFM88iUdA9JDoVMEuP1mm39JqyzHTu |
220 | ++uBrdP4Q= |
221 | + -----END CERTIFICATE----- |
222 | +diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key |
223 | +index 7f2380e71e637b..6a83d5bcf4a521 100644 |
224 | +--- a/test/net/fixtures/server.key |
225 | ++++ b/test/net/fixtures/server.key |
226 | +@@ -1,28 +1,27 @@ |
227 | +------BEGIN PRIVATE KEY----- |
228 | +-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDo2pwBLisQ7EnN |
229 | +-XgcTB5xwnsZ0vBPC4W/Ggv3jSOAspWjHnkLeYFRl5moUV3ow0My1ttnD0t/JJZdU |
230 | +-Z8/2vl7Li+4DxeHi+ef30QxH8LjaM1qtQa3ntaJ7t78w2mD441SivDr9G3TZ3HRC |
231 | +-6Sm+36y0T+sy9Abx4YxLqIv7Keexvx0B7nMP+UDc1RV52cZz0MDdy+TaGUeAxhQE |
232 | +-cv2afI8RgnZJBHnM8lwxIpUTPl1Apk3gowImfVI7u+1loQ/ta7A81N5hFV7T3WgJ |
233 | +-n0pXpcKpbYaSxfSk1LcTO1JjJAXizOOKPNQ1NCsQu1hy5+GNHXSMYRYgPdAcTo9u |
234 | +-/f5kEE9BAgMBAAECggEBAOHkwhc7DLh8IhTDNSW26oMu5OP2WU1jmiYAigDmf+OQ |
235 | +-DBgrZj+JQBci8qINQxL8XLukSZn5hvQCLc7Kbyu1/wyEEUFDxSGGwwzclodr9kho |
236 | +-LX2LDASPZrOSzD2+fPi2wTKmXKuS6Uc44OjQfZkYMNkz9r4Vkm8xGgOD3VipjIYX |
237 | +-QXlhhdqkXZcNABsihCV52GKkDFSVm8jv95YJc5xhoYCy/3a4/qPdF0aT2R7oYUej |
238 | +-hKrxVDskyooe8Zg/JTydZNV5GQEDmW01/K3r6XGT26oPi1AqMU1gtv/jkW56CRQQ |
239 | +-1got8smnqM+AV7Slf9R6DauIPdQJ2S8wsr/o8ISBsOECgYEA9YrqEP2gAYSGFXRt |
240 | +-liw0WI2Ant8BqXS6yvq1jLo/qWhLw/ph4Di73OQ2mpycVTpgfGr2wFPQR1XJ+0Fd |
241 | +-U+Ir/C3Q7FK4VIGHK7B0zNvZr5tEjlFfeRezo2JMVw5YWeSagIFcSwK+KqCTH9qc |
242 | +-pw/Eb8nB/4XNcpTZu7Fg0Wc+ooUCgYEA8sVaicn1Wxkpb45a4qfrA6wOr5xdJ4cC |
243 | +-A5qs7vjX2OdPIQOmoQhdI7bCWFXZzF33wA4YCws6j5wRaySLIJqdms8Gl9QnODy1 |
244 | +-ZlA5gwKToBC/jqPmWAXSKb8EH7cHilaxU9OKnQ7CfwlGLHqjMtjrhR7KHlt3CVRs |
245 | +-oRmvsjZVXI0CgYAmPedslAO6mMhFSSfULrhMXmV82OCqYrrA6EEkVNGbcdnzAOkD |
246 | +-gfKIWabDd8bFY10po4Mguy0CHzNhBXIioWQWV5BlbhC1YKMLw+S9DzSdLAKGY9gJ |
247 | +-xQ4+UQ3wtRQ/k+IYR413RUsW2oFvgZ3KSyNeAb9MK6uuv84VdG/OzVSs/QKBgQDn |
248 | +-kap//l2EbObiWyaERunckdVcW0lcN+KK75J/TGwPoOwQsLvTpPe65kxRGGrtDsEQ |
249 | +-uCDk/+v3KkZPLgdrrTAih9FhJ+PVN8tMcb+6IM4SA4fFFr/UPJEwct0LJ3oQ0grJ |
250 | +-y+HPWFHb/Uurh7t99/4H98uR02sjQh1wOeEmm78mzQKBgQDm+LzGH0se6CXQ6cdZ |
251 | +-g1JRZeXkDEsrW3hfAsW62xJQmXcWxBoblP9OamMY+A06rM5og3JbDk5Zm6JsOaA8 |
252 | +-wS2gw4ilp46jors4eQey8ux7kB9LzdBoDBBElnsbjLO8oBNZlVcYXg+6BOl/CUi7 |
253 | +-2whRF0FEjKA8ehrNhAq+VFfFNw== |
254 | +------END PRIVATE KEY----- |
255 | ++-----BEGIN RSA PRIVATE KEY----- |
256 | ++MIIEowIBAAKCAQEAsPnoGUOnrpiSqt4XynxA+HRP7S+BSObI6qJ7fQAVSPtRkqso |
257 | ++tWxQYLEYzNEx5ZSHTGypibVsJylvCfuToDTfMul8b/CZjP2Ob0LdpYrNH6l5hvFE |
258 | ++89FU1nZQF15oVLOpUgA7wGiHuEVawrGfey92UE68mOyUVXGweJIVDdxqdMoPvNNU |
259 | ++l86BU02vlBiESxOuox+dWmuVV7vfYZ79Toh/LUK43YvJh+rhv4nKuF7iHjVjBd9s |
260 | ++B6iDjj70HFldzOQ9r8SRI+9NirupPTkF5AKNe6kUhKJ1luB7S27ZkvB3tSTT3P59 |
261 | ++3VVJvnzOjaA1z6Cz+4+eRvcysqhrRgFlwI9TEwIDAQABAoIBAEEYiyDP29vCzx/+ |
262 | ++dS3LqnI5BjUuJhXUnc6AWX/PCgVAO+8A+gZRgvct7PtZb0sM6P9ZcLrweomlGezI |
263 | ++FrL0/6xQaa8bBr/ve/a8155OgcjFo6fZEw3Dz7ra5fbSiPmu4/b/kvrg+Br1l77J |
264 | ++aun6uUAs1f5B9wW+vbR7tzbT/mxaUeDiBzKpe15GwcvbJtdIVMa2YErtRjc1/5B2 |
265 | ++BGVXyvlJv0SIlcIEMsHgnAFOp1ZgQ08aDzvilLq8XVMOahAhP1O2A3X8hKdXPyrx |
266 | ++IVWE9bS9ptTo+eF6eNl+d7htpKGEZHUxinoQpWEBTv+iOoHsVunkEJ3vjLP3lyI/ |
267 | ++fY0NQ1ECgYEA3RBXAjgvIys2gfU3keImF8e/TprLge1I2vbWmV2j6rZCg5r/AS0u |
268 | ++pii5CvJ5/T5vfJPNgPBy8B/yRDs+6PJO1GmnlhOkG9JAIPkv0RBZvR0PMBtbp6nT |
269 | ++Y3yo1lwamBVBfY6rc0sLTzosZh2aGoLzrHNMQFMGaauORzBFpY5lU50CgYEAzPHl |
270 | ++u5DI6Xgep1vr8QvCUuEesCOgJg8Yh1UqVoY/SmQh6MYAv1I9bLGwrb3WW/7kqIoD |
271 | ++fj0aQV5buVZI2loMomtU9KY5SFIsPV+JuUpy7/+VE01ZQM5FdY8wiYCQiVZYju9X |
272 | ++Wz5LxMNoz+gT7pwlLCsC4N+R8aoBk404aF1gum8CgYAJ7VTq7Zj4TFV7Soa/T1eE |
273 | ++k9y8a+kdoYk3BASpCHJ29M5R2KEA7YV9wrBklHTz8VzSTFTbKHEQ5W5csAhoL5Fo |
274 | ++qoHzFFi3Qx7MHESQb9qHyolHEMNx6QdsHUn7rlEnaTTyrXh3ifQtD6C0yTmFXUIS |
275 | ++CW9wKApOrnyKJ9nI0HcuZQKBgQCMtoV6e9VGX4AEfpuHvAAnMYQFgeBiYTkBKltQ |
276 | ++XwozhH63uMMomUmtSG87Sz1TmrXadjAhy8gsG6I0pWaN7QgBuFnzQ/HOkwTm+qKw |
277 | ++AsrZt4zeXNwsH7QXHEJCFnCmqw9QzEoZTrNtHJHpNboBuVnYcoueZEJrP8OnUG3r |
278 | ++UjmopwKBgAqB2KYYMUqAOvYcBnEfLDmyZv9BTVNHbR2lKkMYqv5LlvDaBxVfilE0 |
279 | ++2riO4p6BaAdvzXjKeRrGNEKoHNBpOSfYCOM16NjL8hIZB1CaV3WbT5oY+jp7Mzd5 |
280 | ++7d56RZOE+ERK2uz/7JX9VSsM/LbH9pJibd4e8mikDS9ntciqOH/3 |
281 | ++-----END RSA PRIVATE KEY----- |
282 | diff --git a/debian/patches/series b/debian/patches/series |
283 | index 7ba0ac0..7cb93d1 100644 |
284 | --- a/debian/patches/series |
285 | +++ b/debian/patches/series |
286 | @@ -22,3 +22,6 @@ fix-wss-tests.patch |
287 | fix-fiber-tests.patch |
288 | fix-generic-tests.patch |
289 | CVE-2023-36617.patch |
290 | + |
291 | +# Update outdated certificates used in testsuite |
292 | +renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch |
Thanks for the MP.
I'm leaving a comment below asking for DEP-3 headers. I'd also like to clarify why you mentioned "merge" in the Description. Just trying to understand whether you had planned to do an actual merge :-).
Also: is there an upstream/Ubuntu bug regarding this?
Thanks!