diff options
author | Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com> | 2022-07-01 13:32:36 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-15 12:29:17 +0100 |
commit | 6a3d60d87328c80d4461130ff0e063598b95863a (patch) | |
tree | 5e73a1cf287edf76764191e8b193facd1df90c02 | |
parent | 1c38d0d3d66fa8f04b0a4cde11decc5873573ea6 (diff) | |
download | poky-6a3d60d87328c80d4461130ff0e063598b95863a.tar.gz |
openssl: Minor security upgrade 1.1.1o to 1.1.1p
This security upgrade fixes CVE-2022-2068 as per below link
Link: https://www.openssl.org/news/cl111.txt
Also, remove 73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch and
b7ce611887cfac633aacc052b2e71a7f195418b8.patch as these two are part
1.1.1p now
(From OE-Core rev: a8283f9251f59d86f93f9d7cfd4c7e29c61e4631)
Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
Signed-off-by: Ranjitsinh Rathod <ranjitsinhrathod1991@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch | 192 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch | 29 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1p.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.1.1o.bb) | 4 |
3 files changed, 1 insertions, 224 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch b/meta/recipes-connectivity/openssl/openssl/73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch deleted file mode 100644 index 438ecdcd32..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch +++ /dev/null | |||
@@ -1,192 +0,0 @@ | |||
1 | From 73db5d82489b3ec09ccc772dfcee14fef0e8e908 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Mraz <tomas@openssl.org> | ||
3 | Date: Wed, 1 Jun 2022 12:47:44 +0200 | ||
4 | Subject: [PATCH] Update expired SCT certificates | ||
5 | |||
6 | Reviewed-by: Matt Caswell <matt@openssl.org> | ||
7 | Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> | ||
8 | (Merged from https://github.com/openssl/openssl/pull/18446) | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/openssl/openssl/commit/73db5d82489b3ec09ccc772dfcee14fef0e8e908] | ||
11 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | ||
12 | |||
13 | --- | ||
14 | test/certs/embeddedSCTs1-key.pem | 38 ++++++++++++++++--------- | ||
15 | test/certs/embeddedSCTs1.pem | 35 ++++++++++++----------- | ||
16 | test/certs/embeddedSCTs1.sct | 12 ++++---- | ||
17 | test/certs/embeddedSCTs1_issuer-key.pem | 15 ++++++++++ | ||
18 | test/certs/embeddedSCTs1_issuer.pem | 30 +++++++++---------- | ||
19 | 5 files changed, 79 insertions(+), 51 deletions(-) | ||
20 | create mode 100644 test/certs/embeddedSCTs1_issuer-key.pem | ||
21 | |||
22 | diff --git a/test/certs/embeddedSCTs1-key.pem b/test/certs/embeddedSCTs1-key.pem | ||
23 | index e3e66d55c510..28dd206dbe8d 100644 | ||
24 | --- a/test/certs/embeddedSCTs1-key.pem | ||
25 | +++ b/test/certs/embeddedSCTs1-key.pem | ||
26 | @@ -1,15 +1,27 @@ | ||
27 | -----BEGIN RSA PRIVATE KEY----- | ||
28 | -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 | ||
66 | -----END RSA PRIVATE KEY----- | ||
67 | diff --git a/test/certs/embeddedSCTs1.pem b/test/certs/embeddedSCTs1.pem | ||
68 | index d1e85120a043..d2a111fb8235 100644 | ||
69 | --- a/test/certs/embeddedSCTs1.pem | ||
70 | +++ b/test/certs/embeddedSCTs1.pem | ||
71 | @@ -1,20 +1,21 @@ | ||
72 | -----BEGIN CERTIFICATE----- | ||
73 | -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 | ||
108 | +YT6yTEIzJuO07Xp61qnB1CE2TrinUWlyC46Zkw== | ||
109 | -----END CERTIFICATE----- | ||
110 | diff --git a/test/certs/embeddedSCTs1.sct b/test/certs/embeddedSCTs1.sct | ||
111 | index 59362dcee1f4..35c9eb9e3bed 100644 | ||
112 | --- a/test/certs/embeddedSCTs1.sct | ||
113 | +++ b/test/certs/embeddedSCTs1.sct | ||
114 | @@ -2,11 +2,11 @@ Signed Certificate Timestamp: | ||
115 | Version : v1 (0x0) | ||
116 | Log ID : DF:1C:2E:C1:15:00:94:52:47:A9:61:68:32:5D:DC:5C: | ||
117 | 79:59:E8:F7:C6:D3:88:FC:00:2E:0B:BD:3F:74:D7:64 | ||
118 | - Timestamp : Apr 5 17:04:16.275 2013 GMT | ||
119 | + Timestamp : Jan 1 00:00:00.000 2020 GMT | ||
120 | Extensions: none | ||
121 | Signature : ecdsa-with-SHA256 | ||
122 | - 30:45:02:20:48:2F:67:51:AF:35:DB:A6:54:36:BE:1F: | ||
123 | - D6:64:0F:3D:BF:9A:41:42:94:95:92:45:30:28:8F:A3: | ||
124 | - E5:E2:3E:06:02:21:00:E4:ED:C0:DB:3A:C5:72:B1:E2: | ||
125 | - F5:E8:AB:6A:68:06:53:98:7D:CF:41:02:7D:FE:FF:A1: | ||
126 | - 05:51:9D:89:ED:BF:08 | ||
127 | \ No newline at end of file | ||
128 | + 30:45:02:20:7C:33:E8:F1:10:2B:9B:FB:DC:48:46:7A: | ||
129 | + D3:C4:35:BB:E5:D0:E7:94:01:BB:AE:D2:64:4B:99:C4: | ||
130 | + BA:5B:50:CD:02:21:00:D1:B2:07:13:B9:DE:0F:0F:2F: | ||
131 | + 02:82:0F:A5:1D:E0:12:ED:4C:60:48:A0:5B:58:0C:E7: | ||
132 | + 60:EB:A8:AF:03:5E:C3 | ||
133 | \ No newline at end of file | ||
134 | diff --git a/test/certs/embeddedSCTs1_issuer-key.pem b/test/certs/embeddedSCTs1_issuer-key.pem | ||
135 | new file mode 100644 | ||
136 | index 000000000000..9326e38b1eb7 | ||
137 | --- /dev/null | ||
138 | +++ b/test/certs/embeddedSCTs1_issuer-key.pem | ||
139 | @@ -0,0 +1,15 @@ | ||
140 | +-----BEGIN RSA PRIVATE KEY----- | ||
141 | +MIICXAIBAAKBgQDVimhTYhCicRmTbneDIRgcKkATxtB7jHbrkVfT0PtLO1FuzsvR | ||
142 | +yY2RxS90P6tjXVUJnNE6uvMa5UFEJFGnTHgW8iQ8+EjPKDHM5nugSlojgZ88ujfm | ||
143 | +JNnDvbKZuDnd/iYx0ss6hPx7srXFL8/BT/9Ab1zURmnLsvfP34b7arnRsQIDAQAB | ||
144 | +AoGAJLR6xEJp+5IXRFlLn7WTkFvO0ddtxJ7bXhiIkTctyruyfqp7LF9Jv1G2m3PK | ||
145 | +QPUtBc73w/GYkfnwIwdfJbOmPHL7XyEGHZYmEXgIgEtw6LXvAv0G5JpUnNwsSBfL | ||
146 | +GfSQqI5Z5ytyzlJXkMcTGA2kTgNAYc73h4EnU+pwUnDPdAECQQD2aj+4LtYk1XPq | ||
147 | +r3gjgI6MoGvgYJfPmAtZhxxVbhXQKciFUCAcBiwlQdHIdLWE9j65ctmZRWidKifr | ||
148 | +4O4nz+TBAkEA3djNW/rTQq5fKZy+mCF1WYnIU/3yhJaptzRqLm7AHqe7+hdrGXJw | ||
149 | ++mCtU8T3L/Ms8bH1yFBZhmkp1PbR8gl48QJAQo70YyWThiN5yfxXcQ96cZWrTdIJ | ||
150 | +b3NcLXSHPLQdhDqlBQ1dfvRT3ERpC8IqfZ2d162kBPhwh3MpkVcSPQK0gQJAC/dY | ||
151 | +xGBYKt2a9nSk9zG+0bCT5Kvq++ngh6hFHfINXNnxUsEWns3EeEzkrIMQTj7QqszN | ||
152 | +lBt5aL2dawZRNrv6EQJBAOo4STF9KEwQG0HLC/ryh1FeB0OBA5yIepXze+eJVKei | ||
153 | +T0cCECOQJKfWHEzYJYDJhyEFF/sYp9TXwKSDjOifrsU= | ||
154 | +-----END RSA PRIVATE KEY----- | ||
155 | diff --git a/test/certs/embeddedSCTs1_issuer.pem b/test/certs/embeddedSCTs1_issuer.pem | ||
156 | index 1fa449d5a098..6aa9455f09ed 100644 | ||
157 | --- a/test/certs/embeddedSCTs1_issuer.pem | ||
158 | +++ b/test/certs/embeddedSCTs1_issuer.pem | ||
159 | @@ -1,18 +1,18 @@ | ||
160 | -----BEGIN CERTIFICATE----- | ||
161 | -MIIC0DCCAjmgAwIBAgIBADANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJHQjEk | ||
162 | +MIIC0jCCAjugAwIBAgIBADANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJHQjEk | ||
163 | MCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENBMQ4wDAYDVQQIEwVX | ||
164 | -YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAeFw0xMjA2MDEwMDAwMDBaFw0yMjA2MDEw | ||
165 | -MDAwMDBaMFUxCzAJBgNVBAYTAkdCMSQwIgYDVQQKExtDZXJ0aWZpY2F0ZSBUcmFu | ||
166 | -c3BhcmVuY3kgQ0ExDjAMBgNVBAgTBVdhbGVzMRAwDgYDVQQHEwdFcncgV2VuMIGf | ||
167 | -MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVimhTYhCicRmTbneDIRgcKkATxtB7 | ||
168 | -jHbrkVfT0PtLO1FuzsvRyY2RxS90P6tjXVUJnNE6uvMa5UFEJFGnTHgW8iQ8+EjP | ||
169 | -KDHM5nugSlojgZ88ujfmJNnDvbKZuDnd/iYx0ss6hPx7srXFL8/BT/9Ab1zURmnL | ||
170 | -svfP34b7arnRsQIDAQABo4GvMIGsMB0GA1UdDgQWBBRfnYgNyHPmVNT4DdjmsMEk | ||
171 | -tEfDVTB9BgNVHSMEdjB0gBRfnYgNyHPmVNT4DdjmsMEktEfDVaFZpFcwVTELMAkG | ||
172 | -A1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRyYW5zcGFyZW5jeSBDQTEO | ||
173 | -MAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW6CAQAwDAYDVR0TBAUwAwEB | ||
174 | -/zANBgkqhkiG9w0BAQUFAAOBgQAGCMxKbWTyIF4UbASydvkrDvqUpdryOvw4BmBt | ||
175 | -OZDQoeojPUApV2lGOwRmYef6HReZFSCa6i4Kd1F2QRIn18ADB8dHDmFYT9czQiRy | ||
176 | -f1HWkLxHqd81TbD26yWVXeGJPE3VICskovPkQNJ0tU4b03YmnKliibduyqQQkOFP | ||
177 | -OwqULg== | ||
178 | +YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAgFw0yMjA2MDExMDM4MDJaGA8yMTIyMDUw | ||
179 | +ODEwMzgwMlowVTELMAkGA1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRy | ||
180 | +YW5zcGFyZW5jeSBDQTEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW4w | ||
181 | +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANWKaFNiEKJxGZNud4MhGBwqQBPG | ||
182 | +0HuMduuRV9PQ+0s7UW7Oy9HJjZHFL3Q/q2NdVQmc0Tq68xrlQUQkUadMeBbyJDz4 | ||
183 | +SM8oMczme6BKWiOBnzy6N+Yk2cO9spm4Od3+JjHSyzqE/HuytcUvz8FP/0BvXNRG | ||
184 | +acuy98/fhvtqudGxAgMBAAGjga8wgawwHQYDVR0OBBYEFF+diA3Ic+ZU1PgN2Oaw | ||
185 | +wSS0R8NVMH0GA1UdIwR2MHSAFF+diA3Ic+ZU1PgN2OawwSS0R8NVoVmkVzBVMQsw | ||
186 | +CQYDVQQGEwJHQjEkMCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENB | ||
187 | +MQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHRXJ3IFdlboIBADAMBgNVHRMEBTAD | ||
188 | +AQH/MA0GCSqGSIb3DQEBCwUAA4GBAD0aYh9OkFYfXV7kBfhrtD0PJG2U47OV/1qq | ||
189 | ++uFpqB0S1WO06eJT0pzYf1ebUcxjBkajbJZm/FHT85VthZ1lFHsky87aFD8XlJCo | ||
190 | +2IOhKOkvvWKPUdFLoO/ZVXqEVKkcsS1eXK1glFvb07eJZya3JVG0KdMhV2YoDg6c | ||
191 | +Doud4XrO | ||
192 | -----END CERTIFICATE----- | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch b/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch deleted file mode 100644 index 832f651660..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From b7ce611887cfac633aacc052b2e71a7f195418b8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Mraz <tomas@openssl.org> | ||
3 | Date: Wed, 1 Jun 2022 13:06:46 +0200 | ||
4 | Subject: [PATCH] ct_test.c: Update the epoch time | ||
5 | |||
6 | Reviewed-by: Matt Caswell <matt@openssl.org> | ||
7 | Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> | ||
8 | (Merged from https://github.com/openssl/openssl/pull/18446) | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/openssl/openssl/commit/b7ce611887cfac633aacc052b2e71a7f195418b8] | ||
11 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | ||
12 | |||
13 | --- | ||
14 | test/ct_test.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/test/ct_test.c b/test/ct_test.c | ||
18 | index 78d11ca98cf7..535897d09a77 100644 | ||
19 | --- a/test/ct_test.c | ||
20 | +++ b/test/ct_test.c | ||
21 | @@ -63,7 +63,7 @@ static CT_TEST_FIXTURE *set_up(const char *const test_case_name) | ||
22 | if (!TEST_ptr(fixture = OPENSSL_zalloc(sizeof(*fixture)))) | ||
23 | goto end; | ||
24 | fixture->test_case_name = test_case_name; | ||
25 | - fixture->epoch_time_in_ms = 1473269626000ULL; /* Sep 7 17:33:46 2016 GMT */ | ||
26 | + fixture->epoch_time_in_ms = 1580335307000ULL; /* Wed 29 Jan 2020 10:01:47 PM UTC */ | ||
27 | if (!TEST_ptr(fixture->ctlog_store = CTLOG_STORE_new()) | ||
28 | || !TEST_int_eq( | ||
29 | CTLOG_STORE_load_default_file(fixture->ctlog_store), 1)) | ||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1o.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1p.bb index e24467739f..8916218c33 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1o.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1p.bb | |||
@@ -18,15 +18,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
18 | file://afalg.patch \ | 18 | file://afalg.patch \ |
19 | file://reproducible.patch \ | 19 | file://reproducible.patch \ |
20 | file://reproducibility.patch \ | 20 | file://reproducibility.patch \ |
21 | file://73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch \ | ||
22 | file://b7ce611887cfac633aacc052b2e71a7f195418b8.patch \ | ||
23 | " | 21 | " |
24 | 22 | ||
25 | SRC_URI_append_class-nativesdk = " \ | 23 | SRC_URI_append_class-nativesdk = " \ |
26 | file://environment.d-openssl.sh \ | 24 | file://environment.d-openssl.sh \ |
27 | " | 25 | " |
28 | 26 | ||
29 | SRC_URI[sha256sum] = "9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f" | 27 | SRC_URI[sha256sum] = "bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f" |
30 | 28 | ||
31 | inherit lib_package multilib_header multilib_script ptest | 29 | inherit lib_package multilib_header multilib_script ptest |
32 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | 30 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" |