Merged OpenSSH 10.3p1 diff against upstream

[emaste]

Summary

For reference/comparison
git diff -U9999 --diff-filter=M vendor/openssh/10.3p1 HEAD:crypto/openssh

[emaste]

See also D57000 for diff against main

[jlduran]

Looks good.
I get an extra diff after freebsd-configure.sh and freebsd-namespace.sh:

diff --git a/crypto/openssh/krb5_config.h b/crypto/openssh/krb5_config.h
index d95deef0b087..21fde75751e9 100644
--- a/crypto/openssh/krb5_config.h
+++ b/crypto/openssh/krb5_config.h
@@ -1,5 +1,14 @@
+#define ENABLE_SK_INTERNAL /**/
 #define GSSAPI 1
 #define HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE 1
+#define HAVE_FIDO_ASSERT_SET_CLIENTDATA 1
+#define HAVE_FIDO_CRED_PROT 1
+#define HAVE_FIDO_CRED_SET_CLIENTDATA 1
+#define HAVE_FIDO_CRED_SET_PROT 1
+#define HAVE_FIDO_DEV_GET_TOUCH_BEGIN 1
+#define HAVE_FIDO_DEV_GET_TOUCH_STATUS 1
+#define HAVE_FIDO_DEV_IS_WINHELLO 1
+#define HAVE_FIDO_DEV_SUPPORTS_CRED_PROT 1
 #define HAVE_GSSAPI_GSSAPI_GENERIC_H 1
 #define HAVE_GSSAPI_GSSAPI_H 1
 #define HAVE_GSSAPI_GSSAPI_KRB5_H 1
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index 71b53d286dbf..c18171ba7807 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -399,6 +399,7 @@
 #define libcrux_ml_kem_ntt_ntt_at_layer_4_plus_ea Fssh_libcrux_ml_kem_ntt_ntt_at_layer_4_plus_ea
 #define libcrux_ml_kem_polynomial_ntt_multiply_d6_ea Fssh_libcrux_ml_kem_polynomial_ntt_multiply_d6_ea
 #define libcrux_ml_kem_polynomial_poly_barrett_reduce_d6_ea Fssh_libcrux_ml_kem_polynomial_poly_barrett_reduce_d6_ea
+#define libcrux_ml_kem_sampling_sample_from_binomial_distribution_a0 Fssh_libcrux_ml_kem_sampling_sample_from_binomial_distribution_a0
 #define libcrux_ml_kem_serialize_deserialize_ring_elements_reduced_1b Fssh_libcrux_ml_kem_serialize_deserialize_ring_elements_reduced_1b
 #define libcrux_sha3_generic_keccak_keccakf1600_80_04 Fssh_libcrux_sha3_generic_keccak_keccakf1600_80_04
 #define load_hostkeys                          Fssh_load_hostkeys

I'm only testing on aarch64 (extra ssh_namespace entries may appear).

openbsd-compat/libressl-api-compat.c

29 ↗

(On Diff #177818)

These changes were submitted as patch: https://bugzilla.mindrot.org/show_bug.cgi?id=3873
It has not been accepted (yet?).

[emaste]

Oh, I think krb5_config.h is a mistake when I brought the diff over from my test branch, regenerating it now matches what you have.
I'll re-check ssh-namespace.h