From: Steve Sakoman Date: Tue, 7 Jun 2022 18:52:56 +0000 (-1000) Subject: openssl: update the epoch time for ct_test ptest X-Git-Tag: 2020-04.18-dunfell~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3af161acc13189cb68549f898f3964d83d00ce56;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git 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. Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch b/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch new file mode 100644 index 00000000000..832f6516605 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/b7ce611887cfac633aacc052b2e71a7f195418b8.patch @@ -0,0 +1,29 @@ +From b7ce611887cfac633aacc052b2e71a7f195418b8 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Wed, 1 Jun 2022 13:06:46 +0200 +Subject: [PATCH] ct_test.c: Update the epoch time + +Reviewed-by: Matt Caswell +Reviewed-by: Dmitry Belyavskiy +(Merged from https://github.com/openssl/openssl/pull/18446) + +Upstream-Status: Backport [https://github.com/openssl/openssl/commit/b7ce611887cfac633aacc052b2e71a7f195418b8] +Signed-off-by: Steve Sakoman + +--- + test/ct_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ct_test.c b/test/ct_test.c +index 78d11ca98cf7..535897d09a77 100644 +--- a/test/ct_test.c ++++ b/test/ct_test.c +@@ -63,7 +63,7 @@ static CT_TEST_FIXTURE *set_up(const char *const test_case_name) + if (!TEST_ptr(fixture = OPENSSL_zalloc(sizeof(*fixture)))) + goto end; + fixture->test_case_name = test_case_name; +- fixture->epoch_time_in_ms = 1473269626000ULL; /* Sep 7 17:33:46 2016 GMT */ ++ fixture->epoch_time_in_ms = 1580335307000ULL; /* Wed 29 Jan 2020 10:01:47 PM UTC */ + if (!TEST_ptr(fixture->ctlog_store = CTLOG_STORE_new()) + || !TEST_int_eq( + 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 b306414776f..e24467739ff 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 \ file://reproducible.patch \ file://reproducibility.patch \ file://73db5d82489b3ec09ccc772dfcee14fef0e8e908.patch \ + file://b7ce611887cfac633aacc052b2e71a7f195418b8.patch \ " SRC_URI_append_class-nativesdk = " \