openssh: refresh patches for 8.6p1
PATCH 1/1 openssh: refresh patches for 8.6p1
Refresh patches:
0001-openssh-8.6p1-fips.patch
0001-conditional-enable-fips-mode.patch
Signed-off-by Yi Zhao <[email protected]>
---
.../0001-conditional-enable-fips-mode.patch | 38 +++++++------
...ps.patch => 0001-openssh-8.6p1-fips.patch} | 55 ++++++++++---------
recipes-connectivity/openssh/openssh_fips.inc | 2 +-
3 files changed, 50 insertions(+), 45 deletions(-)
rename recipes-connectivity/openssh/openssh/{0001-openssh-8.4p1-fips.patch => 0001-openssh-8.6p1-fips.patch} (92%)recipes-connectivity/openssh/openssh/0001-conditional-enable-fips-mode.patch +20 -18
@@ -1,4 +1,4 @@ -From 48888de317391522186c6ae24a8d6d7d7add2673 Mon Sep 17 00:00:00 2001 +From 1696484c2a06e2ec095d748d2155eb8206dd850b Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Sat, 21 Dec 2019 13:03:23 +0800 Subject: [PATCH] conditional enable fips mode
@@ -14,11 +14,12 @@ The ssh_malloc_init function is removed in openssh 8.1p1, we need to insert ssh_enable_fips_mode function to main function for all applications. +Rebase to 8.6p1 Signed-off-by: Yi Zhao <[email protected]> --- sftp-server-main.c | 1 + sftp-server.c | 1 + - sftp.c | 1 + + sftp.c | 2 ++ ssh-add.c | 1 + ssh-agent.c | 1 + ssh-keygen.c | 1 +
@@ -29,7 +30,7 @@ Signed-off-by: Yi Zhao <[email protected]> sshd.c | 1 + xmalloc.c | 20 ++++++++++++++++++++ xmalloc.h | 1 + - 13 files changed, 32 insertions(+) + 13 files changed, 33 insertions(+) diff --git a/sftp-server-main.c b/sftp-server-main.c index 06566d3..a10566d 100644
@@ -44,10 +45,10 @@ index 06566d3..a10566d 100644 sanitise_stdfd(); diff --git a/sftp-server.c b/sftp-server.c -index 7300900..42da9d7 100644 +index 838f048..8a8d87b 100644 --- a/sftp-server.c +++ b/sftp-server.c -@@ -1616,6 +1616,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) +@@ -1656,6 +1656,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) extern char *optarg; extern char *__progname;
@@ -56,19 +57,20 @@ index 7300900..42da9d7 100644 log_init(__progname, log_level, log_facility, log_stderr); diff --git a/sftp.c b/sftp.c -index fb3c08d..85b9b67 100644 +index 3f46c55..e9c8f1d 100644 --- a/sftp.c +++ b/sftp.c -@@ -2345,6 +2345,7 @@ main(int argc, char **argv) - size_t num_requests = DEFAULT_NUM_REQUESTS; +@@ -2342,6 +2342,8 @@ main(int argc, char **argv) + size_t num_requests = 0; long long limit_kbps = 0; + ssh_enable_fips_mode(); ++ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); msetlocale(); diff --git a/ssh-add.c b/ssh-add.c -index 7edb9f9..c75f85b 100644 +index 92192fc..4ed14cd 100644 --- a/ssh-add.c +++ b/ssh-add.c @@ -667,6 +667,7 @@ main(int argc, char **argv)
@@ -80,7 +82,7 @@ index 7edb9f9..c75f85b 100644 sanitise_stdfd(); diff --git a/ssh-agent.c b/ssh-agent.c -index 58fe6dd..9018a7c 100644 +index 48a47d4..8a0d7a2 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1388,6 +1388,7 @@ main(int ac, char **av)
@@ -92,7 +94,7 @@ index 58fe6dd..9018a7c 100644 sanitise_stdfd(); diff --git a/ssh-keygen.c b/ssh-keygen.c -index 6451584..246caa1 100644 +index fc73943..cdb45a9 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -3153,6 +3153,7 @@ main(int argc, char **argv)
@@ -140,7 +142,7 @@ index a9a6fe3..3c76f70 100644 seed_rng(); TAILQ_INIT(&pkcs11_keylist); diff --git a/ssh.c b/ssh.c -index 729d87a..ab78b53 100644 +index a6e7642..8f91534 100644 --- a/ssh.c +++ b/ssh.c @@ -650,6 +650,7 @@ main(int ac, char **av)
@@ -152,10 +154,10 @@ index 729d87a..ab78b53 100644 sanitise_stdfd(); diff --git a/sshd.c b/sshd.c -index fee4703..07faf7b 100644 +index b2ab001..8112d2c 100644 --- a/sshd.c +++ b/sshd.c -@@ -1534,6 +1534,7 @@ main(int ac, char **av) +@@ -1535,6 +1535,7 @@ main(int ac, char **av) Authctxt *authctxt; struct connection_info *connection_info = NULL;
@@ -199,13 +201,13 @@ index b48d33b..456a063 100644 + } +} diff --git a/xmalloc.h b/xmalloc.h -index abaf7ad..b3b1c8c 100644 +index a6b8d23..18fe756 100644 --- a/xmalloc.h +++ b/xmalloc.h -@@ -26,3 +26,4 @@ int xasprintf(char **, const char *, ...) - __attribute__((__nonnull__ (2))); +@@ -25,3 +25,4 @@ int xasprintf(char **, const char *, ...) + __attribute__((__format__ (printf, 2, 3))) __attribute__((__nonnull__ (2))); int xvasprintf(char **, const char *, va_list) - __attribute__((__nonnull__ (2))); + __attribute__((__nonnull__ (2))); +void ssh_enable_fips_mode(void); -- 2.17.1
recipes-connectivity/openssh/openssh/0001-openssh-8.6p1-fips.patch renamed from recipes-connectivity/openssh/openssh/0001-openssh-8.4p1-fips.patch +29 -26
165 lines not on this page · raw message
recipes-connectivity/openssh/openssh_fips.inc +1 -1
@@ -6,7 +6,7 @@ DEPENDS += " \ RRECOMMENDS_${PN}-sshd_remove = "rng-tools" SRC_URI += " \ - file://0001-openssh-8.4p1-fips.patch \ + file://0001-openssh-8.6p1-fips.patch \ file://0001-conditional-enable-fips-mode.patch \ file://openssh-6.6p1-ctr-cavstest.patch \ file://openssh-6.7p1-kdf-cavs.patch \
Signature · 1 line
2.25.1