openssh: Update to 10.5p1

[emaste]

Summary

This is a diff against upstream 10.5p1 after the update

[jlduran]

Do you think I can commit D52203 after you commit this update, or maybe incorporate those changes here?
The changes from freebsd-configure.sh (config.h) and freebsd-namespace.sh (ssh_namespace.h) are in a separate commit as usual?
I have this change in libssh's Makefile:

--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -35,7 +35,7 @@ SRCS= ${LIBOPENSSH_SRCS} \
        libcrux-mlkem-mldsa.c ssh-mldsa-eddsa.c \
        hmac.c ed25519.c ed25519-openssl.c \
        kex.c kex-names.c kexdh.c kexgex.c kexecdh.c kexc25519.c \
-       kexgexc.c kexgexs.c \
+       kexgexc.c kexgexs.c kexmlkem768ecdh.c \
        kexsntrup761x25519.c kexmlkem768x25519.c sntrup761.c kexgen.c \
        sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c \
        sshbuf-io.c misc-agent.c ssherr-libcrypto.c

servconf.c

326

[emaste]

I think you should commit D52203 now, I will rebase this change after.

I have this change in libssh's Makefile:

Yeah, I just grabbed the diff between crypto/openssh and upstream for this phab diff. secure/lib/libssh/Makefile has your change.

[jlduran]

In D59172#1357540, @emaste wrote:

I think you should commit D52203 now, I will rebase this change after.

Done!

[jlduran]

servconf.c

253

I'll try to submit this defaultkey check/patch, while preparing the patch, I wonder if we should use strcmp(3) instead (given my other suggestion change below):

if (file != NULL && strcmp(file, defaultkey) == 0 &&
    access(apath, R_OK) != 0) {