commit 6866e22
Michael Forney
·
2025-04-28 23:44:24 +0000 UTC
parent 340938b
openssh: Update to 10.0p2
4 files changed,
+76,
-26
+23,
-5
1@@ -5,6 +5,8 @@
2 #define _PATH_SFTP_SERVER "/libexec/sftp-server"
3 #define _PATH_SSH_ASKPASS_DEFAULT "/libexec/ssh-askpass"
4 #define _PATH_SSH_KEY_SIGN "/libexec/ssh-keysign"
5+#define _PATH_SSHD_SESSION "/libexec/sshd-session"
6+#define _PATH_SSHD_AUTH "/libexec/sshd-auth"
7 #define _PATH_SSH_PIDDIR "/run"
8 #define _PATH_SSH_PKCS11_HELPER "/libexec/ssh-pkcs11-helper"
9 #define _PATH_SSH_SK_HELPER "/libexec/ssh-sk-helper"
10@@ -84,6 +86,8 @@
11 #define HAVE_ATTRIBUTE__NONNULL__ 1
12 /* #undef HAVE_ATTRIBUTE__SENTINEL__ */
13 /* #undef HAVE_AUG_GET_MACHINE */
14+/* #undef HAVE_AUTH_HOSTOK */
15+/* #undef HAVE_AUTH_TIMEOK */
16 #define HAVE_B64_NTOP 1
17 #define HAVE_B64_PTON 1
18 #define HAVE_BASENAME 1
19@@ -101,6 +105,8 @@
20 /* #undef HAVE_BSTRING_H */
21 #define HAVE_BZERO 1
22 #define HAVE_CALLOC 1
23+/* #undef HAVE_CAPH_CACHE_TZDATA */
24+/* #undef HAVE_CAPSICUM_HELPERS_H */
25 /* #undef HAVE_CAP_RIGHTS_LIMIT */
26 #define HAVE_CLOCK 1
27 #define HAVE_CLOCK_GETTIME 1
28@@ -118,16 +124,20 @@
29 /* #undef HAVE_DECL_AUTHENTICATE */
30 #define HAVE_DECL_BZERO 1
31 #define HAVE_DECL_FTRUNCATE 1
32+#define HAVE_DECL_GETENTROPY 1
33 #define HAVE_DECL_GETPEEREID 0
34 #define HAVE_DECL_GLOB_NOMATCH 1
35 /* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */
36 #define HAVE_DECL_HOWMANY 1
37+#define HAVE_DECL_HTOLE64 1
38 #define HAVE_DECL_H_ERRNO 1
39+#define HAVE_DECL_LE32TOH 1
40+#define HAVE_DECL_LE64TOH 1
41 /* #undef HAVE_DECL_LOGINFAILED */
42 /* #undef HAVE_DECL_LOGINRESTRICTIONS */
43 /* #undef HAVE_DECL_LOGINSUCCESS */
44 #define HAVE_DECL_MAXSYMLINKS 1
45-#define HAVE_DECL_MEMMEM 0
46+#define HAVE_DECL_MEMMEM 1
47 #define HAVE_DECL_NFDBITS 1
48 #define HAVE_DECL_OFFSETOF 1
49 #define HAVE_DECL_O_NONBLOCK 1
50@@ -171,6 +181,7 @@
51 #define HAVE_FIDO_CRED_SET_PROT 1
52 #define HAVE_FIDO_DEV_GET_TOUCH_BEGIN 1
53 #define HAVE_FIDO_DEV_GET_TOUCH_STATUS 1
54+#define HAVE_FIDO_DEV_IS_WINHELLO 1
55 #define HAVE_FIDO_DEV_SUPPORTS_CRED_PROT 1
56 /* #undef HAVE_FLOATINGPOINT_H */
57 #define HAVE_FLOCK 1
58@@ -189,6 +200,7 @@
59 /* #undef HAVE_GETAUDIT */
60 /* #undef HAVE_GETAUDIT_ADDR */
61 #define HAVE_GETCWD 1
62+#define HAVE_GETENTROPY 1
63 #define HAVE_GETGROUPLIST 1
64 /* #undef HAVE_GETGRSET */
65 /* #undef HAVE_GETLASTLOGXBYNAME */
66@@ -379,7 +391,7 @@
67 /* #undef HAVE_SHA512UPDATE */
68 #define HAVE_SHADOW_H 1
69 #define HAVE_SIGACTION 1
70-/* #undef HAVE_SIGHANDLER_T */
71+#define HAVE_SIGHANDLER_T 1
72 /* #undef HAVE_SIGVEC */
73 #define HAVE_SIG_ATOMIC_T 1
74 #define HAVE_SIZE_T 1
75@@ -431,7 +443,6 @@
76 #define HAVE_STRUCT_STAT_ST_MTIME 1
77 #define HAVE_STRUCT_TIMESPEC 1
78 #define HAVE_STRUCT_TIMEVAL 1
79-/* #undef HAVE_SWAP32 */
80 #define HAVE_SYSCONF 1
81 /* #undef HAVE_SYSLEN_IN_UTMPX */
82 /* #undef HAVE_SYS_AUDIT_H */
83@@ -473,6 +484,7 @@
84 #define HAVE_TCGETPGRP 1
85 #define HAVE_TCSENDBREAK 1
86 #define HAVE_TIME 1
87+#define HAVE_TIMEGM 1
88 #define HAVE_TIME_H 1
89 /* #undef HAVE_TIME_IN_UTMP */
90 /* #undef HAVE_TIME_IN_UTMPX */
91@@ -533,6 +545,7 @@
92 /* #undef KRB5 */
93 /* #undef LASTLOG_WRITE_PUTUTXLINE */
94 #define LINK_OPNOTSUPP_ERRNO EPERM
95+/* #undef LINUX_MEMLOCK_ONFAULT */
96 #define LINUX_OOM_ADJUST 1
97 /* #undef LLONG_MAX */
98 /* #undef LLONG_MIN */
99@@ -541,6 +554,7 @@
100 /* #undef LOCKED_PASSWD_SUBSTR */
101 /* #undef LOGIN_NEEDS_UTMPX */
102 /* #undef MAIL_DIRECTORY */
103+/* #undef MISSING_BUILTIN_POPCOUNT */
104 /* #undef NEED_SETPGRP */
105 /* #undef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS */
106 /* #undef NO_ATTRIBUTE_ON_RETURN_TYPE */
107@@ -561,11 +575,12 @@
108 /* #undef SANDBOX_CAPSICUM */
109 /* #undef SANDBOX_DARWIN */
110 /* #undef SANDBOX_NULL */
111-/* #undef SANDBOX_PLEDGE */
112+/* #undef SANDBOX_RLIMIT */
113+/* #undef SANDBOX_SECCOMP_FILTER */
114 /* #undef SANDBOX_SKIP_RLIMIT_FSIZE */
115 /* #undef SANDBOX_SKIP_RLIMIT_NOFILE */
116 /* #undef SANDBOX_SOLARIS */
117-/* #undef SANDBOX_SYSTRACE */
118+/* #undef SECCOMP_AUDIT_ARCH */
119 /* #undef SETEUID_BREAKS_SETUID */
120 #define SIZEOF_INT 4
121 #define SIZEOF_LONG_INT SIZEOF_LONG
122@@ -573,6 +588,7 @@
123 #define SIZEOF_SHORT_INT 2
124 /* probe SIZEOF_TIME_T */
125 #define SNPRINTF_CONST const
126+/* #undef SOCK_HAS_LEN */
127 #define SPT_TYPE SPT_REUSEARGV
128 /* #undef SSHD_ACQUIRES_CTTY */
129 /* #undef SSHD_PAM_SERVICE */
130@@ -589,6 +605,7 @@
131 #define STDC_HEADERS 1
132 /* #undef SUPERUSER_PATH */
133 /* #undef SYSLOG_R_SAFE_IN_SIGHAND */
134+/* #undef SYSTEMD_NOTIFY */
135 #define SYS_RDOMAIN_LINUX 1
136 /* #undef UNIXWARE_LONG_PASSWORDS */
137 #define USER_PATH "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin"
138@@ -602,6 +619,7 @@
139 /* #undef USE_SOLARIS_PRIVS */
140 /* #undef USE_SOLARIS_PROCESS_CONTRACTS */
141 /* #undef USE_SOLARIS_PROJECTS */
142+/* #undef USE_WTMPDB */
143 #define VARIABLE_DECLARATION_AFTER_CODE 1
144 /* #undef VARIABLE_LENGTH_ARRAYS */
145 /* #undef WITH_ABBREV_NO_TTY */
+51,
-19
1@@ -85,23 +85,32 @@ lib('libssh.a', [[
2 ssh-pkcs11.c smult_curve25519_ref.c
3 poly1305.c chacha.c cipher-chachapoly.c cipher-chachapoly-bearssl.c
4 ssh-ed25519.c digest-bearssl.c digest-libc.c
5- hmac.c sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c
6- kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c
7+ hmac.c ed25519.c hash.c
8+ kex.c kex-names.c kexdh.c kexgex.c kexecdh.c kexc25519.c
9 kexgexc.c kexgexs.c
10- kexsntrup761x25519.c sntrup761.c kexgen.c
11+ kexsntrup761x25519.c kexmlkem768x25519.c sntrup761.c kexgen.c
12 sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c
13 sshbuf-io.c
14
15 ssh-sk-client.c
16
17- sftp-common.c sftp-client.c sftp-glob.c sftp-server.c
18-
19 libopenbsd-compat.a
20 $builddir/pkg/bearssl/libbearssl.a
21 $builddir/pkg/libfido2/libfido2.a.d
22 $builddir/pkg/zlib/libz.a
23 ]])
24
25+lib('sftp-client.a', [[
26+ sftp-common.c
27+ sftp-client.c
28+ sftp-glob.c
29+]])
30+
31+lib('sftp-server.a', [[
32+ sftp-common.c.o
33+ sftp-server.c
34+]])
35+
36 exe('ssh', [[
37 ssh.c readconf.c clientloop.c sshtty.c
38 sshconnect.c sshconnect2.c mux.c
39@@ -110,25 +119,48 @@ exe('ssh', [[
40 file('bin/ssh', '755', '$outdir/ssh')
41
42 exe('sshd', [[
43- sshd.c auth-rhosts.c auth-passwd.c
44+ sshd.c
45+ platform-listen.c
46+ servconf.c sshpty.c srclimit.c groupaccess.c auth2-methods.c
47+ libssh.a.d
48+]])
49+file('bin/sshd', '755', '$outdir/sshd')
50+
51+-- used by sshd-session and sshd-auth
52+lib('sshd-common.a', [[
53+ auth-rhosts.c auth-passwd.c
54 audit.c audit-bsm.c audit-linux.c platform.c
55- sshpty.c sshlogin.c servconf.c serverloop.c
56- auth.c auth2.c auth-options.c session.c
57- auth2-chall.c groupaccess.c
58+ sshpty.c.o sshlogin.c.o servconf.c.o serverloop.c
59+ auth.c auth2.c auth2-methods.c.o auth-options.c session.c
60+ auth2-chall.c groupaccess.c.o
61 auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c
62- auth2-none.c auth2-passwd.c auth2-pubkey.c
63- monitor.c monitor_wrap.c auth-krb5.c
64+ auth2-none.c auth2-passwd.c auth2-pubkey.c auth2-pubkeyfile.c
65+ monitor_wrap.c auth-krb5.c
66 auth2-gss.c gss-serv.c gss-serv-krb5.c
67 loginrec.c auth-pam.c auth-shadow.c auth-sia.c
68- srclimit.c
69- sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c
70- sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c
71- sandbox-solaris.c uidswap.c
72+ uidswap.c
73+]])
74+
75+exe('sshd-session', [[
76+ sshd-session.c
77+ monitor.c platform-listen.c.o
78+ sshd-common.a
79+ sftp-server.a
80 libssh.a.d
81 ]])
82-file('bin/sshd', '755', '$outdir/sshd')
83+file('libexec/sshd-session', '755', '$outdir/sshd-session')
84+
85+exe('sshd-auth', [[
86+ sshd-auth.c
87+ sandbox-null.c sandbox-rlimit.c sandbox-darwin.c
88+ sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-solaris.c
89+ sshd-common.a
90+ sftp-server.a
91+ libssh.a.d
92+]])
93+file('libexec/sshd-auth', '755', '$outdir/sshd-auth')
94
95-exe('scp', {'scp.c', 'libssh.a.d'})
96+exe('scp', {'scp.c', 'sftp-client.a', 'libssh.a.d'})
97 file('bin/scp', '755', '$outdir/scp')
98
99 exe('ssh-add', {'ssh-add.c', 'libssh.a.d'})
100@@ -146,10 +178,10 @@ file('bin/ssh-keyscan', '755', '$outdir/ssh-keyscan')
101 exe('ssh-sk-helper', {'ssh-sk-helper.c', 'ssh-sk.c', 'sk-usbhid.c', 'libssh.a.d'})
102 file('libexec/ssh-sk-helper', '755', '$outdir/ssh-sk-helper')
103
104-exe('sftp-server', {'sftp-server-main.c', 'libssh.a.d'})
105+exe('sftp-server', {'sftp-server-main.c', 'sftp-server.a', 'libssh.a.d'})
106 file('libexec/sftp-server', '755', '$outdir/sftp-server')
107
108-exe('sftp', {'sftp.c', 'libssh.a.d'})
109+exe('sftp', {'sftp.c', 'sftp-usergroup.c', 'sftp-client.a', 'libssh.a.d'})
110 file('bin/sftp', '755', '$outdir/sftp')
111
112 man{
+1,
-1
1@@ -1 +1 @@
2-Subproject commit 2f0c259bb7159c98dd183a6b607b57fb59757aec
3+Subproject commit a4978283269f6c5fa269687ca41e02c9bbe6afbe
+1,
-1
1@@ -1 +1 @@
2-9.0p1 r0
3+10.0p2 r0