diff --git a/openssh/src/0001-fix-uint64_t-types-reported-by-Tom-G.-Christensen.patch b/openssh/src/0001-fix-uint64_t-types-reported-by-Tom-G.-Christensen.patch deleted file mode 100644 index 8cf6258..0000000 --- a/openssh/src/0001-fix-uint64_t-types-reported-by-Tom-G.-Christensen.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 88b35cbdc1500efece65cd6a9a20a72cf7e46eaa Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Wed, 30 Oct 2024 14:25:14 +1100 -Subject: [PATCH] fix uint64_t types; reported by Tom G. Christensen - ---- - defines.h | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/defines.h b/defines.h -index b02f2942a..c1c21aba6 100644 ---- a/defines.h -+++ b/defines.h -@@ -653,14 +653,14 @@ struct winsize { - ((uint32_t)(v) & 0xff0000) >> 8 | \ - ((uint32_t)(v) & 0xff000000) >> 24) - # define openssh_swap64(v) \ -- (__uint64_t)((((__uint64_t)(v) & 0xff) << 56) | \ -- ((__uint64_t)(v) & 0xff00ULL) << 40 | \ -- ((__uint64_t)(v) & 0xff0000ULL) << 24 | \ -- ((__uint64_t)(v) & 0xff000000ULL) << 8 | \ -- ((__uint64_t)(v) & 0xff00000000ULL) >> 8 | \ -- ((__uint64_t)(v) & 0xff0000000000ULL) >> 24 | \ -- ((__uint64_t)(v) & 0xff000000000000ULL) >> 40 | \ -- ((__uint64_t)(v) & 0xff00000000000000ULL) >> 56) -+ (uint64_t)((((uint64_t)(v) & 0xff) << 56) | \ -+ ((uint64_t)(v) & 0xff00ULL) << 40 | \ -+ ((uint64_t)(v) & 0xff0000ULL) << 24 | \ -+ ((uint64_t)(v) & 0xff000000ULL) << 8 | \ -+ ((uint64_t)(v) & 0xff00000000ULL) >> 8 | \ -+ ((uint64_t)(v) & 0xff0000000000ULL) >> 24 | \ -+ ((uint64_t)(v) & 0xff000000000000ULL) >> 40 | \ -+ ((uint64_t)(v) & 0xff00000000000000ULL) >> 56) - # ifdef WORDS_BIGENDIAN - # define le32toh(v) (openssh_swap32(v)) - # define le64toh(v) (openssh_swap64(v)) --- -2.36.6 - diff --git a/openssh/src/old-autoconf.patch b/openssh/src/old-autoconf.patch deleted file mode 100644 index 51ab81c..0000000 --- a/openssh/src/old-autoconf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- openssh-9.9p1/configure.ac.oldauto 2024-10-29 20:46:15.947704000 +0000 -+++ openssh-9.9p1/configure.ac 2024-10-30 13:44:37.092847000 +0000 -@@ -28,6 +28,7 @@ - - AC_CONFIG_HEADERS([config.h]) - AC_PROG_CC([cc gcc clang]) -+m4_version_prereq([2.70], [:], [AC_PROG_CC_C99]) - - # XXX relax this after reimplementing logit() etc. - AC_MSG_CHECKING([if $CC supports C99-style variadic macros]) diff --git a/openssh/src/openssh-9.9-fixes.patch b/openssh/src/openssh-9.9-fixes.patch deleted file mode 100644 index 7d4210a..0000000 --- a/openssh/src/openssh-9.9-fixes.patch +++ /dev/null @@ -1,708 +0,0 @@ -From 8513f4d30ae85d17b3b08da6bc3be76f8c73123c Mon Sep 17 00:00:00 2001 -From: Darren Tucker -Date: Mon, 23 Sep 2024 20:52:31 +1000 -Subject: [PATCH 01/10] Add 9.9 branch to CI status console. - ---- - .github/ci-status.md | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/.github/ci-status.md b/.github/ci-status.md -index 4fa73894c..68275715d 100644 ---- a/.github/ci-status.md -+++ b/.github/ci-status.md -@@ -6,6 +6,10 @@ master : - [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/openssh.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:openssh) - [![Coverity Status](https://scan.coverity.com/projects/21341/badge.svg)](https://scan.coverity.com/projects/openssh-portable) - -+9.9 : -+[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_9) -+[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_9) -+ - 9.8 : - [![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_8) - [![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_8) --- -2.36.6 - - -From 7cf4dc414de689c467e58e49fb83f6609c3ed36b Mon Sep 17 00:00:00 2001 -From: Darren Tucker -Date: Mon, 23 Sep 2024 20:54:26 +1000 -Subject: [PATCH 02/10] Remove non-9.9 branch statuses. - ---- - .github/ci-status.md | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/.github/ci-status.md b/.github/ci-status.md -index 68275715d..17fa97bdc 100644 ---- a/.github/ci-status.md -+++ b/.github/ci-status.md -@@ -9,11 +9,3 @@ master : - 9.9 : - [![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_9) - [![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_9) -- --9.8 : --[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_8) --[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_8) -- --9.7 : --[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_7) --[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_7) --- -2.36.6 - - -From c7fda601186ff28128cfe3eab9c9c0622de096e1 Mon Sep 17 00:00:00 2001 -From: Christoph Ostarek -Date: Wed, 3 Jul 2024 12:46:59 +0200 -Subject: [PATCH 03/10] fix utmpx ifdef - -02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for -utmpx, but forgot to change the ifdef appropriately ---- - loginrec.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/loginrec.c b/loginrec.c -index 7460bb2c0..45f13dee8 100644 ---- a/loginrec.c -+++ b/loginrec.c -@@ -723,7 +723,7 @@ set_utmpx_time(struct logininfo *li, struct utmpx *utx) - void - construct_utmpx(struct logininfo *li, struct utmpx *utx) - { --# ifdef HAVE_ADDR_V6_IN_UTMP -+# ifdef HAVE_ADDR_V6_IN_UTMPX - struct sockaddr_in6 *sa6; - # endif - memset(utx, '\0', sizeof(*utx)); -@@ -769,7 +769,7 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx) - if (li->hostaddr.sa.sa_family == AF_INET) - utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr; - # endif --# ifdef HAVE_ADDR_V6_IN_UTMP -+# ifdef HAVE_ADDR_V6_IN_UTMPX - /* this is just a 128-bit IPv6 address */ - if (li->hostaddr.sa.sa_family == AF_INET6) { - sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa); --- -2.36.6 - - -From 2c12ae8cf9b0b7549ae097c4123abeda0ee63e5b Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Wed, 25 Sep 2024 11:13:05 +1000 -Subject: [PATCH 04/10] build construct_utmp() when USE_BTMP is set - -Fixes compile error on Void Linux/Musl ---- - loginrec.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/loginrec.c b/loginrec.c -index 45f13dee8..7b1818b86 100644 ---- a/loginrec.c -+++ b/loginrec.c -@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize) - ** into account. - **/ - --#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) -+#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) - - /* build the utmp structure */ - void -@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li, - } - # endif - } --#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */ -+#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */ - - /** - ** utmpx utility functions --- -2.36.6 - - -From ff2cd1dd5711ff88efdf26662d6189d980439a1f Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Wed, 25 Sep 2024 11:15:45 +1000 -Subject: [PATCH 05/10] gss-serv.c needs sys/param.h - -From Void Linux ---- - gss-serv.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gss-serv.c b/gss-serv.c -index 00e3d118b..025a118f8 100644 ---- a/gss-serv.c -+++ b/gss-serv.c -@@ -29,6 +29,7 @@ - #ifdef GSSAPI - - #include -+#include - - #include - #include --- -2.36.6 - - -From 66878e12a207fa9746dee3e2bdcca29b704cf035 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Wed, 25 Sep 2024 01:24:04 +0000 -Subject: [PATCH 06/10] upstream: fix regression introduced when I switched the - "Match" - -criteria tokeniser to a more shell-like one. Apparently the old tokeniser -(accidentally?) allowed "Match criteria=argument" as well as the "Match -criteria argument" syntax that we tested for. - -People were using this syntax so this adds back support for -"Match criteria=argument" - -bz3739 ok dtucker - -OpenBSD-Commit-ID: d1eebedb8c902002b75b75debfe1eeea1801f58a ---- - misc.c | 23 +++++++++++++++++++++- - misc.h | 3 ++- - readconf.c | 28 ++++++++++++++++++++++----- - servconf.c | 57 ++++++++++++++++++++++++++++++++++++++++-------------- - 4 files changed, 89 insertions(+), 22 deletions(-) - -diff --git a/misc.c b/misc.c -index afdf5142e..1b4b55c50 100644 ---- a/misc.c -+++ b/misc.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: misc.c,v 1.196 2024/06/06 17:15:25 djm Exp $ */ -+/* $OpenBSD: misc.c,v 1.197 2024/09/25 01:24:04 djm Exp $ */ - /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. - * Copyright (c) 2005-2020 Damien Miller. All rights reserved. -@@ -107,6 +107,27 @@ rtrim(char *s) - } - } - -+/* -+ * returns pointer to character after 'prefix' in 's' or otherwise NULL -+ * if the prefix is not present. -+ */ -+const char * -+strprefix(const char *s, const char *prefix, int ignorecase) -+{ -+ size_t prefixlen; -+ -+ if ((prefixlen = strlen(prefix)) == 0) -+ return s; -+ if (ignorecase) { -+ if (strncasecmp(s, prefix, prefixlen) != 0) -+ return NULL; -+ } else { -+ if (strncmp(s, prefix, prefixlen) != 0) -+ return NULL; -+ } -+ return s + prefixlen; -+} -+ - /* set/unset filedescriptor to non-blocking */ - int - set_nonblock(int fd) -diff --git a/misc.h b/misc.h -index 113403896..efecdf1ad 100644 ---- a/misc.h -+++ b/misc.h -@@ -1,4 +1,4 @@ --/* $OpenBSD: misc.h,v 1.109 2024/06/06 17:15:25 djm Exp $ */ -+/* $OpenBSD: misc.h,v 1.110 2024/09/25 01:24:04 djm Exp $ */ - - /* - * Author: Tatu Ylonen -@@ -56,6 +56,7 @@ struct ForwardOptions { - char *chop(char *); - void rtrim(char *); - void skip_space(char **); -+const char *strprefix(const char *, const char *, int); - char *strdelim(char **); - char *strdelimw(char **); - int set_nonblock(int); -diff --git a/readconf.c b/readconf.c -index 3d9cc6dbb..de42fb6ff 100644 ---- a/readconf.c -+++ b/readconf.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: readconf.c,v 1.390 2024/09/15 00:57:36 djm Exp $ */ -+/* $OpenBSD: readconf.c,v 1.391 2024/09/25 01:24:04 djm Exp $ */ - /* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland -@@ -710,7 +710,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - struct passwd *pw, const char *host_arg, const char *original_host, - int final_pass, int *want_final_pass, const char *filename, int linenum) - { -- char *arg, *oattrib, *attrib, *cmd, *host, *criteria; -+ char *arg, *oattrib, *attrib = NULL, *cmd, *host, *criteria; - const char *ruser; - int r, this_result, result = 1, attributes = 0, negate; - -@@ -731,7 +731,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - - debug2("checking match for '%s' host %s originally %s", - full_line, host, original_host); -- while ((oattrib = attrib = argv_next(acp, avp)) != NULL) { -+ while ((oattrib = argv_next(acp, avp)) != NULL) { -+ attrib = xstrdup(oattrib); - /* Terminate on comment */ - if (*attrib == '#') { - argv_consume(acp); -@@ -777,9 +778,23 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - this_result ? "" : "not ", oattrib); - continue; - } -+ -+ /* Keep this list in sync with below */ -+ if (strprefix(attrib, "host=", 1) != NULL || -+ strprefix(attrib, "originalhost=", 1) != NULL || -+ strprefix(attrib, "user=", 1) != NULL || -+ strprefix(attrib, "localuser=", 1) != NULL || -+ strprefix(attrib, "localnetwork=", 1) != NULL || -+ strprefix(attrib, "tagged=", 1) != NULL || -+ strprefix(attrib, "exec=", 1) != NULL) { -+ arg = strchr(attrib, '='); -+ *(arg++) = '\0'; -+ } else { -+ arg = argv_next(acp, avp); -+ } -+ - /* All other criteria require an argument */ -- if ((arg = argv_next(acp, avp)) == NULL || -- *arg == '\0' || *arg == '#') { -+ if (arg == NULL || *arg == '\0' || *arg == '#') { - error("Missing Match criteria for %s", attrib); - result = -1; - goto out; -@@ -856,6 +871,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - criteria == NULL ? "" : criteria, - criteria == NULL ? "" : "\""); - free(criteria); -+ free(attrib); -+ attrib = NULL; - } - if (attributes == 0) { - error("One or more attributes required for Match"); -@@ -865,6 +882,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - out: - if (result != -1) - debug2("match %sfound", result ? "" : "not "); -+ free(attrib); - free(host); - return result; - } -diff --git a/servconf.c b/servconf.c -index 89b8413e8..dd774f468 100644 ---- a/servconf.c -+++ b/servconf.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: servconf.c,v 1.418 2024/09/15 03:09:44 djm Exp $ */ -+/* $OpenBSD: servconf.c,v 1.419 2024/09/25 01:24:04 djm Exp $ */ - /* - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved -@@ -1033,7 +1033,7 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - int line, struct connection_info *ci) - { - int result = 1, attributes = 0, port; -- char *arg, *attrib; -+ char *arg, *attrib = NULL, *oattrib; - - if (ci == NULL) - debug3("checking syntax for 'Match %s'", full_line); -@@ -1047,7 +1047,8 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - ci->laddress ? ci->laddress : "(null)", ci->lport); - } - -- while ((attrib = argv_next(acp, avp)) != NULL) { -+ while ((oattrib = argv_next(acp, avp)) != NULL) { -+ attrib = xstrdup(oattrib); - /* Terminate on comment */ - if (*attrib == '#') { - argv_consume(acp); /* mark all arguments consumed */ -@@ -1062,11 +1063,13 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - *arg != '\0' && *arg != '#')) { - error("'all' cannot be combined with other " - "Match attributes"); -- return -1; -+ result = -1; -+ goto out; - } - if (arg != NULL && *arg == '#') - argv_consume(acp); /* consume remaining args */ -- return 1; -+ result = 1; -+ goto out; - } - /* Criterion "invalid-user" also has no argument */ - if (strcasecmp(attrib, "invalid-user") == 0) { -@@ -1078,11 +1081,26 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - debug("matched invalid-user at line %d", line); - continue; - } -+ -+ /* Keep this list in sync with below */ -+ if (strprefix(attrib, "user=", 1) != NULL || -+ strprefix(attrib, "group=", 1) != NULL || -+ strprefix(attrib, "host=", 1) != NULL || -+ strprefix(attrib, "address=", 1) != NULL || -+ strprefix(attrib, "localaddress=", 1) != NULL || -+ strprefix(attrib, "localport=", 1) != NULL || -+ strprefix(attrib, "rdomain=", 1) != NULL) { -+ arg = strchr(attrib, '='); -+ *(arg++) = '\0'; -+ } else { -+ arg = argv_next(acp, avp); -+ } -+ - /* All other criteria require an argument */ -- if ((arg = argv_next(acp, avp)) == NULL || -- *arg == '\0' || *arg == '#') { -+ if (arg == NULL || *arg == '\0' || *arg == '#') { - error("Missing Match criteria for %s", attrib); -- return -1; -+ result = -1; -+ goto out; - } - if (strcasecmp(attrib, "user") == 0) { - if (ci == NULL || (ci->test && ci->user == NULL)) { -@@ -1105,7 +1123,8 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - match_test_missing_fatal("Group", "user"); - switch (match_cfg_line_group(arg, line, ci->user)) { - case -1: -- return -1; -+ result = -1; -+ goto out; - case 0: - result = 0; - } -@@ -1141,7 +1160,8 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - result = 0; - break; - case -2: -- return -1; -+ result = -1; -+ goto out; - } - } else if (strcasecmp(attrib, "localaddress") == 0){ - if (ci == NULL || (ci->test && ci->laddress == NULL)) { -@@ -1166,13 +1186,15 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - result = 0; - break; - case -2: -- return -1; -+ result = -1; -+ goto out; - } - } else if (strcasecmp(attrib, "localport") == 0) { - if ((port = a2port(arg)) == -1) { - error("Invalid LocalPort '%s' on Match line", - arg); -- return -1; -+ result = -1; -+ goto out; - } - if (ci == NULL || (ci->test && ci->lport == -1)) { - result = 0; -@@ -1200,16 +1222,21 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, - debug("user %.100s matched 'RDomain %.100s' at " - "line %d", ci->rdomain, arg, line); - } else { -- error("Unsupported Match attribute %s", attrib); -- return -1; -+ error("Unsupported Match attribute %s", oattrib); -+ result = -1; -+ goto out; - } -+ free(attrib); -+ attrib = NULL; - } - if (attributes == 0) { - error("One or more attributes required for Match"); - return -1; - } -- if (ci != NULL) -+ out: -+ if (ci != NULL && result != -1) - debug3("match %sfound", result ? "" : "not "); -+ free(attrib); - return result; - } - --- -2.36.6 - - -From 19bcb2d90c6caf14abf386b644fb24eb7afab889 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Thu, 26 Sep 2024 23:55:08 +0000 -Subject: [PATCH 07/10] upstream: fix previous change to ssh_config Match, - which broken on - -negated Matches; spotted by phessler@ ok deraadt@ - -OpenBSD-Commit-ID: b1c6acec66cd5bd1252feff1d02ad7129ced37c7 ---- - readconf.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/readconf.c b/readconf.c -index de42fb6ff..9f5592698 100644 ---- a/readconf.c -+++ b/readconf.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: readconf.c,v 1.391 2024/09/25 01:24:04 djm Exp $ */ -+/* $OpenBSD: readconf.c,v 1.392 2024/09/26 23:55:08 djm Exp $ */ - /* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland -@@ -710,7 +710,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - struct passwd *pw, const char *host_arg, const char *original_host, - int final_pass, int *want_final_pass, const char *filename, int linenum) - { -- char *arg, *oattrib, *attrib = NULL, *cmd, *host, *criteria; -+ char *arg, *oattrib = NULL, *attrib = NULL, *cmd, *host, *criteria; - const char *ruser; - int r, this_result, result = 1, attributes = 0, negate; - -@@ -731,8 +731,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - - debug2("checking match for '%s' host %s originally %s", - full_line, host, original_host); -- while ((oattrib = argv_next(acp, avp)) != NULL) { -- attrib = xstrdup(oattrib); -+ while ((attrib = argv_next(acp, avp)) != NULL) { -+ attrib = oattrib = xstrdup(attrib); - /* Terminate on comment */ - if (*attrib == '#') { - argv_consume(acp); -@@ -871,8 +871,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - criteria == NULL ? "" : criteria, - criteria == NULL ? "" : "\""); - free(criteria); -- free(attrib); -- attrib = NULL; -+ free(oattrib); -+ oattrib = attrib = NULL; - } - if (attributes == 0) { - error("One or more attributes required for Match"); -@@ -882,7 +882,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, - out: - if (result != -1) - debug2("match %sfound", result ? "" : "not "); -- free(attrib); -+ free(oattrib); - free(host); - return result; - } --- -2.36.6 - - -From 11f348196b3fb51c3d8d1f4f36db9d73f03149ed Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Sun, 27 Oct 2024 02:06:01 +0000 -Subject: [PATCH 08/10] upstream: fix ML-KEM768x25519 KEX on big-endian - systems; spotted by - -jsg@ feedback/ok deraadt@ - -OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0 ---- - libcrux_mlkem768_sha3.h | 8 +++++--- - mlkem768.sh | 17 ++++++++++++----- - 2 files changed, 17 insertions(+), 8 deletions(-) - -diff --git a/libcrux_mlkem768_sha3.h b/libcrux_mlkem768_sha3.h -index a82d60e83..b8ac1436f 100644 ---- a/libcrux_mlkem768_sha3.h -+++ b/libcrux_mlkem768_sha3.h -@@ -1,4 +1,5 @@ --/* $OpenBSD: libcrux_mlkem768_sha3.h,v 1.1 2024/09/02 12:13:56 djm Exp $ */ -+/* $OpenBSD: libcrux_mlkem768_sha3.h,v 1.2 2024/10/27 02:06:01 djm Exp $ */ -+ - /* Extracted from libcrux revision 84c5d87b3092c59294345aa269ceefe0eb97cc35 */ - - /* -@@ -160,18 +161,19 @@ static inline void Eurydice_slice_to_array3(uint8_t *dst_tag, char *dst_ok, - // CORE STUFF (conversions, endianness, ...) - - static inline void core_num__u64_9__to_le_bytes(uint64_t v, uint8_t buf[8]) { -+ v = htole64(v); - memcpy(buf, &v, sizeof(v)); - } - static inline uint64_t core_num__u64_9__from_le_bytes(uint8_t buf[8]) { - uint64_t v; - memcpy(&v, buf, sizeof(v)); -- return v; -+ return le64toh(v); - } - - static inline uint32_t core_num__u32_8__from_le_bytes(uint8_t buf[4]) { - uint32_t v; - memcpy(&v, buf, sizeof(v)); -- return v; -+ return le32toh(v); - } - - static inline uint32_t core_num__u8_6__count_ones(uint8_t x0) { -diff --git a/mlkem768.sh b/mlkem768.sh -index 2fdc28312..3d12b2ed8 100644 ---- a/mlkem768.sh -+++ b/mlkem768.sh -@@ -1,9 +1,10 @@ - #!/bin/sh --# $OpenBSD: mlkem768.sh,v 1.2 2024/09/04 05:11:33 djm Exp $ -+# $OpenBSD: mlkem768.sh,v 1.3 2024/10/27 02:06:01 djm Exp $ - # Placed in the Public Domain. - # - --WANT_LIBCRUX_REVISION="origin/main" -+#WANT_LIBCRUX_REVISION="origin/main" -+WANT_LIBCRUX_REVISION="84c5d87b3092c59294345aa269ceefe0eb97cc35" - - FILES=" - libcrux/libcrux-ml-kem/cg/eurydice_glue.h -@@ -47,6 +48,7 @@ echo '#define KRML_NOINLINE __attribute__((noinline, unused))' - echo '#define KRML_HOST_EPRINTF(...)' - echo '#define KRML_HOST_EXIT(x) fatal_f("internal error")' - echo -+ - for i in $FILES; do - echo "/* from $i */" - # Changes to all files: -@@ -56,11 +58,16 @@ for i in $FILES; do - -e 's/[ ]*$//' \ - $i | \ - case "$i" in -- # XXX per-file handling goes here. -+ */libcrux-ml-kem/cg/eurydice_glue.h) -+ # Replace endian functions with versions that work. -+ perl -0777 -pe 's/(static inline void core_num__u64_9__to_le_bytes.*\n)([^}]*\n)/\1 v = htole64(v);\n\2/' | -+ perl -0777 -pe 's/(static inline uint64_t core_num__u64_9__from_le_bytes.*?)return v;/\1return le64toh(v);/s' | -+ perl -0777 -pe 's/(static inline uint32_t core_num__u32_8__from_le_bytes.*?)return v;/\1return le32toh(v);/s' -+ ;; - # Default: pass through. - *) -- cat -- ;; -+ cat -+ ;; - esac - echo - done --- -2.36.6 - - -From fe8d28a7ebbaa35cfc04a21263627f05c237e460 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Sun, 27 Oct 2024 02:06:59 +0000 -Subject: [PATCH 09/10] upstream: explicitly include endian.h - -OpenBSD-Commit-ID: 13511fdef7535bdbc35b644c90090013da43a318 ---- - kexmlkem768x25519.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/kexmlkem768x25519.c b/kexmlkem768x25519.c -index 679446e97..2b5d39608 100644 ---- a/kexmlkem768x25519.c -+++ b/kexmlkem768x25519.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: kexmlkem768x25519.c,v 1.1 2024/09/02 12:13:56 djm Exp $ */ -+/* $OpenBSD: kexmlkem768x25519.c,v 1.2 2024/10/27 02:06:59 djm Exp $ */ - /* - * Copyright (c) 2023 Markus Friedl. All rights reserved. - * -@@ -34,6 +34,9 @@ - #include - #include - #include -+#ifdef HAVE_ENDIAN_H -+# include -+#endif - - #include "sshkey.h" - #include "kex.h" --- -2.36.6 - - -From 33c5f384ae03a5d1a0bd46ca0fac3c62e4eaf784 Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Sun, 27 Oct 2024 13:28:11 +1100 -Subject: [PATCH 10/10] htole64() etc for systems without endian.h - ---- - configure.ac | 1 - - defines.h | 26 ++++++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 591d5a388..9053a9a2b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2013,7 +2013,6 @@ AC_CHECK_FUNCS([ \ - strtoll \ - strtoul \ - strtoull \ -- swap32 \ - sysconf \ - tcgetpgrp \ - timegm \ -diff --git a/defines.h b/defines.h -index ed860e78b..b02f2942a 100644 ---- a/defines.h -+++ b/defines.h -@@ -646,6 +646,32 @@ struct winsize { - # endif /* WORDS_BIGENDIAN */ - #endif /* BYTE_ORDER */ - -+#ifndef HAVE_ENDIAN_H -+# define openssh_swap32(v) \ -+ (uint32_t)(((uint32_t)(v) & 0xff) << 24 | \ -+ ((uint32_t)(v) & 0xff00) << 8 | \ -+ ((uint32_t)(v) & 0xff0000) >> 8 | \ -+ ((uint32_t)(v) & 0xff000000) >> 24) -+# define openssh_swap64(v) \ -+ (__uint64_t)((((__uint64_t)(v) & 0xff) << 56) | \ -+ ((__uint64_t)(v) & 0xff00ULL) << 40 | \ -+ ((__uint64_t)(v) & 0xff0000ULL) << 24 | \ -+ ((__uint64_t)(v) & 0xff000000ULL) << 8 | \ -+ ((__uint64_t)(v) & 0xff00000000ULL) >> 8 | \ -+ ((__uint64_t)(v) & 0xff0000000000ULL) >> 24 | \ -+ ((__uint64_t)(v) & 0xff000000000000ULL) >> 40 | \ -+ ((__uint64_t)(v) & 0xff00000000000000ULL) >> 56) -+# ifdef WORDS_BIGENDIAN -+# define le32toh(v) (openssh_swap32(v)) -+# define le64toh(v) (openssh_swap64(v)) -+# define htole64(v) (openssh_swap64(v)) -+# else -+# define le32toh(v) ((uint32_t)v) -+# define le64toh(v) ((uint64_t)v) -+# define htole64(v) ((uint64_t)v) -+# endif -+#endif -+ - /* Function replacement / compatibility hacks */ - - #if !defined(HAVE_GETADDRINFO) && (defined(HAVE_OGETADDRINFO) || defined(HAVE_NGETADDRINFO)) --- -2.36.6 -