summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-02-21 03:29:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-08 23:07:12 (GMT)
commit19efe1272fe175dbae2a3c923a8ee270bfd748cf (patch)
treedcb1a2de348e86d775f17d4895bd494e6f15e274
parent4c773c7b03fb4596cd3873261de438dfd7b44158 (diff)
downloadpoky-19efe1272fe175dbae2a3c923a8ee270bfd748cf.tar.gz
openssh: backport patch to fix "cert not yet valid" test
Fixes [YOCTO #13796] (From OE-Core rev: f830a6df31b4232e2a481c2c27148ff70ebb0a13) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> [Fix up for warrior context] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch46
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.9p1.bb1
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch
new file mode 100644
index 0000000..e2930c3
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch
@@ -0,0 +1,46 @@
1From 3cccc0a2ab597b8273bddf08e9a3cc5551d7e530 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Fri, 3 Jan 2020 03:02:26 +0000
4Subject: [PATCH] upstream: what bozo decided to use 2020 as a future date in a
5 regress
6
7test?
8
9OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a
10
11Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381]
12
13[Dropped the script version and copyright year change at the top]
14
15Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
16---
17 regress/cert-hostkey.sh | 2 +-
18 regress/cert-userkey.sh | 2 +-
19 2 files changed, 2 insertions(+), 2 deletions(-)
20
21diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
22index 3ce7779..74d5a53 100644
23--- a/regress/cert-hostkey.sh
24+++ b/regress/cert-hostkey.sh
25@@ -248,7 +248,7 @@ test_one() {
26 test_one "user-certificate" failure "-n $HOSTS"
27 test_one "empty principals" success "-h"
28 test_one "wrong principals" failure "-h -n foo"
29-test_one "cert not yet valid" failure "-h -V20200101:20300101"
30+test_one "cert not yet valid" failure "-h -V20300101:20320101"
31 test_one "cert expired" failure "-h -V19800101:19900101"
32 test_one "cert valid interval" success "-h -V-1w:+2w"
33 test_one "cert has constraints" failure "-h -Oforce-command=false"
34diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
35index 6849e99..de455b8 100644
36--- a/regress/cert-userkey.sh
37+++ b/regress/cert-userkey.sh
38@@ -327,7 +327,7 @@ test_one() {
39 test_one "correct principal" success "-n ${USER}"
40 test_one "host-certificate" failure "-n ${USER} -h"
41 test_one "wrong principals" failure "-n foo"
42-test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101"
43+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101"
44 test_one "cert expired" failure "-n ${USER} -V19800101:19900101"
45 test_one "cert valid interval" success "-n ${USER} -V-1w:+2w"
46 test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8"
diff --git a/meta/recipes-connectivity/openssh/openssh_7.9p1.bb b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb
index 6c8f732..4d4f275 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb
@@ -28,6 +28,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
28 file://CVE-2019-6109.patch \ 28 file://CVE-2019-6109.patch \
29 file://0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch \ 29 file://0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch \
30 file://CVE-2019-6111.patch \ 30 file://CVE-2019-6111.patch \
31 file://0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch \
31 " 32 "
32SRC_URI[md5sum] = "c6af50b7a474d04726a5aa747a5dce8f" 33SRC_URI[md5sum] = "c6af50b7a474d04726a5aa747a5dce8f"
33SRC_URI[sha256sum] = "6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad" 34SRC_URI[sha256sum] = "6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad"