summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2022-06-07 08:52:56 -1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-11 10:06:09 +0100
commit99478d73c5d259c2b10baa7982befab9d67244e3 (patch)
tree3ed7ed442d91b533045dbe9dab939093ffaa7948 /meta
parent196895a482ea434f361bfdb7325a319802b89c3a (diff)
downloadpoky-99478d73c5d259c2b10baa7982befab9d67244e3.tar.gz
openssl: update the epoch time for ct_test ptest
We are getting an additional ptest failure after fixing the expired certificates. Backport a patch from upstream to fix this. (From OE-Core rev: 3af161acc13189cb68549f898f3964d83d00ce56) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch29
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.1o.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch b/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch
new file mode 100644
index 0000000000..832f651660
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch
@@ -0,0 +1,29 @@
1From b7ce611887cfac633aacc052b2e71a7f195418b8 Mon Sep 17 00:00:00 2001
2From: Tomas Mraz <tomas@openssl.org>
3Date: Wed, 1 Jun 2022 13:06:46 +0200
4Subject: [PATCH] ct_test.c: Update the epoch time
5
6Reviewed-by: Matt Caswell <matt@openssl.org>
7Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
8(Merged from https://github.com/openssl/openssl/pull/18446)
9
10Upstream-Status: Backport [https://github.com/openssl/openssl/commit/b7ce611887cfac633aacc052b2e71a7f195418b8]
11Signed-off-by: Steve Sakoman <steve@sakoman.com>
12
13---
14 test/ct_test.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/test/ct_test.c b/test/ct_test.c
18index 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.1o.bb
index b306414776..e24467739f 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1o.bb
@@ -19,6 +19,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
19 file://reproducible.patch \ 19 file://reproducible.patch \
20 file://reproducibility.patch \ 20 file://reproducibility.patch \
21 file://73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch \ 21 file://73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch \
22 file://b7ce611887cfac633aacc052b2e71a7f195418b8.patch \
22 " 23 "
23 24
24SRC_URI_append_class-nativesdk = " \ 25SRC_URI_append_class-nativesdk = " \