diff options
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch b/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch deleted file mode 100644 index 7171ec0834..0000000000 --- a/meta/recipes-connectivity/openssh/openssh/0001-Manually-applied-upstream-fix-for-openssh-test.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 0a68d6cfe255f8bcdd5f9db0d008a8f0a60b237a Mon Sep 17 00:00:00 2001 | ||
2 | From: "Mingde (Matthew) Zeng" <matthew.zeng@windriver.com> | ||
3 | Date: Wed, 15 Jan 2020 15:51:42 -0500 | ||
4 | Subject: [PATCH] Manually applied upstream fix for openssh test | ||
5 | |||
6 | Upstream Status: Backport: | ||
7 | https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381 | ||
8 | |||
9 | Signed-off-by: Mingde (Matthew) Zeng<matthew.zeng@windriver.com> | ||
10 | --- | ||
11 | regress/cert-hostkey.sh | 4 ++-- | ||
12 | regress/cert-userkey.sh | 5 ++--- | ||
13 | 2 files changed, 4 insertions(+), 5 deletions(-) | ||
14 | |||
15 | diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh | ||
16 | index 86ea6250..60e3ec02 100644 | ||
17 | --- a/regress/cert-hostkey.sh | ||
18 | +++ b/regress/cert-hostkey.sh | ||
19 | @@ -1,4 +1,4 @@ | ||
20 | -# $OpenBSD: cert-hostkey.sh,v 1.18 2019/07/25 08:28:15 dtucker Exp $ | ||
21 | +# $OpenBSD: cert-hostkey.sh,v 1.23 2020/01/03 03:02:26 djm Exp $ | ||
22 | # Placed in the Public Domain. | ||
23 | |||
24 | tid="certified host keys" | ||
25 | @@ -252,7 +252,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" | ||
34 | diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh | ||
35 | index 38c14a69..f0e30945 100644 | ||
36 | --- a/regress/cert-userkey.sh | ||
37 | +++ b/regress/cert-userkey.sh | ||
38 | @@ -1,4 +1,4 @@ | ||
39 | -# $OpenBSD: cert-userkey.sh,v 1.21 2019/07/25 08:28:15 dtucker Exp $ | ||
40 | +# $OpenBSD: cert-userkey.sh,v 1.25 2020/01/03 03:02:26 djm Exp $ | ||
41 | # Placed in the Public Domain. | ||
42 | |||
43 | tid="certified user keys" | ||
44 | @@ -338,7 +338,7 @@ test_one() { | ||
45 | test_one "correct principal" success "-n ${USER}" | ||
46 | test_one "host-certificate" failure "-n ${USER} -h" | ||
47 | test_one "wrong principals" failure "-n foo" | ||
48 | -test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101" | ||
49 | +test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101" | ||
50 | test_one "cert expired" failure "-n ${USER} -V19800101:19900101" | ||
51 | test_one "cert valid interval" success "-n ${USER} -V-1w:+2w" | ||
52 | test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8" | ||
53 | @@ -399,4 +399,3 @@ done | ||
54 | |||
55 | rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key* | ||
56 | rm -f $OBJ/authorized_principals_$USER | ||
57 | - | ||
58 | -- | ||
59 | 2.24.1 | ||
60 | |||