Skip to content

Commit 92d5293

Browse files
thkukukthkukuk
authored
Merge branch 'master' into systemd-set-tty
2 parents 18a79b3 + 8054b90 commit 92d5293

File tree

156 files changed

+7232
-4037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+7232
-4037
lines changed

‎.depend‎

Lines changed: 12 additions & 7 deletions
Large diffs are not rendered by default.

‎.git_allowed_signers‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
dtucker@dtucker.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKecyjh9aNmD4rb8WblA8v91JjRb0Cd2JtkzqxcggGeG
2+
dtucker@dtucker.net sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBDV81zWQ1+XVfWH5z4L4klDQ/z/6l2GLphfSTX/Rmq6kL5H8mkfzUlryxLlkN8cD9srtVJBAmwJWfJBNsCo958YAAAAEc3NoOg==
3+
24
djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLnJo3ZVDENYZGXm5uO9lU7b0iDFq5gHpTu1MaHPWTEfPdvw+AjFQQ/q5YizuMJkXGsMdYmblJEJZYHpm9IS7ZkAAAAEc3NoOg==
35
djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJoAXBTQalfg+kC5wy1vE7HkIHtVnmV6AUuuIo9KQ1P+70juHwvsFKpsGaqQbrHJkTVgYDGVP02XHj8+Fb18yBIAAAAEc3NoOg==
46
djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBH+z1I48s6ydOhP5SJmI02zVCLf0K15B+UMHgoTIKVfUIv5oDoVX7e9f+7QiRmTeEOdZfQydiaVqsfi7qPSve+0AAAAEc3NoOg==

‎.git_allowed_signers.asc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
-----BEGIN PGP SIGNATURE-----
22

3-
iQIzBAABCgAdFiEEcWi5g4FaXu9ZpK39Kj9BTnNgYLoFAmMMMiIACgkQKj9BTnNg
4-
YLpyGhAAhZ1RxmD62JnT0gnor1aD0inq1fGPRadaFvXH2OScPcxXMIZWx+otnyZ/
5-
H9s0bIti42dPHqurgh92KS2mDGVIW8Y8MvxFUr678+hdem1U7Xvjoo0uaveNhJhe
6-
GxuQDOvXKRmmfL2c6w3wnFChFA1o3K+JNshjCHhWz7u6+UmY0Q9yIxqbSi+vmEPP
7-
NfWPfGdu4h8r7q11UgTxRSUQkfZXMqpBtb367B9BLduGuKRFKEJNyi6WpjBrqy38
8-
BvEbAaL52KX8hEp3TKMjo38RbOK+veSoPV5zlLui0WlEwwasgljal3f4RkqCAJob
9-
hqpFJRogM5XNnA2e68TDTf3buJ3wRRjuK39/CusOJz5v4i6+VCdte+BET1Y4gD6y
10-
v8KV4pRyumcdbN3khFUkmaQsjo+fyQjWNrgOvv60J2xUWZdchn8lxHOxrfRVKnOi
11-
BD4bdks7tPQY/XsS5GNJIp21Ji9HGyBajjHo0BlesLodw7FEOf6YE18A3n9qzosR
12-
RliuP4Hs/Z4sCUuDTbpKtQiUVs40kBbkhEL8kS8FsXz3VO89hAWaUqNUYom8AkKv
13-
nfDjrZDBLXuVj1Mi8qNPXxqrB/1Cza2/W4U7SK4TlMFXfoXXWxxhefN5vIdMhAJB
14-
u9Mdz1pY9mowKbd0c0dR+3fauvjM133dzKuyeDHMqDa5JPyd59o=
15-
=kgnS
3+
iQIzBAABCgAdFiEEcWi5g4FaXu9ZpK39Kj9BTnNgYLoFAmYHnZ8ACgkQKj9BTnNg
4+
YLquuQ/6A8E6P2jcgn3wmbbCTXP7kmxoh3nmw/e6PC8CEua1512oT3GHOKVD5cGK
5+
cgYRObpWvjOjg7L1HRABftq7a9M2zfsGnY/WNe3/fbetfkyY8hG8c31vA1ePIOt2
6+
AjBLCWFblH0CtyH/MssoQ19JCLtXK/GmekB1Q0JzyOog7w/0r3CKuUnZ0juCYR1R
7+
4FBePl5l3nFSZEcFEdptGlNGeuolS5XBCqB9Y91TCzkVkH5eXUUW+shgjNhWCEhT
8+
pZvkxfhsmOEnwNofyPdgKVfDBVkHmvuC67EU395mJVN4c2NZ8pOztb9hOt3xr980
9+
q44I4kT2NpaApCx1dWIGhMy/37LJ8heI0W1B+ofTA5n34/RU8UXH3SCkj2AK6Ao5
10+
H2u8vbmuWKUCiECmrw35EeKGmtuK/bWJzx3KBP7fx5J9S3mWUgT4W4xlWNN9RWoU
11+
sSvH1ppie5ARINVaAWl5k44fk60ahTf80DbQBIOZBmQn7myZZka+yGcQbAiZZ1Gc
12+
0l8+Nf5Ao1ckmuyY5o8FyWdsyDeK3+MqjPn5Rr1CqbKCn2VnqrVWbI33Eyu8c96U
13+
bxVgU5H1BDhNjJC8UrT3LFPvJMO8p3a0IJ3eHydjk2jVOhOdBZmA0yoqUTrhPpXq
14+
ymIHESjDJR8TDe4TCfb46o9oEC3cdbDwgnzPqdg0n+0uIsJLYiU=
15+
=gl+l
1616
-----END PGP SIGNATURE-----

‎.github/ci-status.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ master :
66
[![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)
77
[![Coverity Status](https://scan.coverity.com/projects/21341/badge.svg)](https://scan.coverity.com/projects/openssh-portable)
88

9-
9.4 :
10-
[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_4)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_4)
11-
[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_4)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_4)
12-
13-
9.3 :
14-
[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_3)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_3)
15-
[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_3)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_3)
9+
9.7 :
10+
[![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)
11+
[![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)

‎.github/configs‎

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ case "$config" in
3030
default|sol64)
3131
;;
3232
c89)
33+
# If we don't have LLONG_MAX, configure will figure out that it can
34+
# get it by setting -std=gnu99, at which point we won't be testing
35+
# C89 any more. To avoid this, feed it in via CFLAGS.
36+
llong_max=`gcc -E -dM - </dev/null | \
37+
awk '$2=="__LONG_LONG_MAX__"{print $3}'`
38+
CPPFLAGS="-DLLONG_MAX=${llong_max}"
39+
3340
CC="gcc"
3441
CFLAGS="-Wall -std=c89 -pedantic -Werror=vla"
3542
CONFIGFLAGS="--without-zlib"
@@ -101,9 +108,19 @@ case "$config" in
101108
SKIP_LTESTS=sftp-chroot
102109
;;
103110
gcc-11-Werror)
104-
CC="gcc"
111+
CC="gcc-11"
112+
# -Wnoformat-truncation in gcc 7.3.1 20180130 fails on fmt_scaled
113+
# -Wunused-result ignores (void) so is not useful. See
114+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
115+
CFLAGS="-O2 -Wno-format-truncation -Wimplicit-fallthrough=4 -Wno-unused-parameter -Wno-unused-result"
116+
CONFIGFLAGS="--with-pam --with-Werror"
117+
;;
118+
gcc-12-Werror)
119+
CC="gcc-12"
105120
# -Wnoformat-truncation in gcc 7.3.1 20180130 fails on fmt_scaled
106-
CFLAGS="-Wall -Wextra -O2 -Wno-format-truncation -Wimplicit-fallthrough=4 -Wno-unused-parameter"
121+
# -Wunused-result ignores (void) so is not useful. See
122+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
123+
CFLAGS="-O2 -Wno-format-truncation -Wimplicit-fallthrough=4 -Wno-unused-parameter -Wno-unused-result"
107124
CONFIGFLAGS="--with-pam --with-Werror"
108125
;;
109126
clang*|gcc*)
@@ -147,6 +164,11 @@ case "$config" in
147164
libressl-*)
148165
LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl --with-rpath=-Wl,-rpath,"
149166
;;
167+
putty-*)
168+
CONFIGFLAGS="--with-plink=/usr/local/bin/plink --with-puttygen=/usr/local/bin/puttygen"
169+
# We don't need to rerun the regular tests, just the interop ones.
170+
TEST_TARGET=interop-tests
171+
;;
150172
openssl-*)
151173
LIBCRYPTOFLAGS="--with-ssl-dir=/opt/openssl --with-rpath=-Wl,-rpath,"
152174
# OpenSSL 1.1.1 specifically has a bug in its RNG that breaks reexec
@@ -252,20 +274,22 @@ case "${TARGET_HOST}" in
252274
;;
253275
minix3)
254276
CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key"
277+
# Unix domain sockets don't work quite like we expect, so also
278+
# disable FD passing (and thus multiplexing).
279+
CONFIGFLAGS="${CONFIGFLAGS} --disable-fd-passing"
255280
LIBCRYPTOFLAGS="--without-openssl"
281+
256282
# Minix does not have a loopback interface so we have to skip any
257283
# test that relies on one.
258284
# Also, Minix seems to be very limited in the number of select()
259285
# calls that can be operating concurrently, so prune additional tests for that.
260286
T="addrmatch agent-restrict brokenkeys cfgmatch cfgmatchlisten cfgparse
261-
connect connect-uri exit-status forwarding hostkey-agent
262-
key-options keyscan knownhosts-command login-timeout
287+
connect connect-uri dynamic-forward exit-status forwarding
288+
forward-control
289+
hostkey-agent key-options keyscan knownhosts-command login-timeout
263290
reconfigure reexec rekey scp scp-uri scp3 sftp sftp-badcmds
264291
sftp-batch sftp-cmds sftp-glob sftp-perm sftp-uri stderr-data
265292
transfer"
266-
# Unix domain sockets don't work quite like we expect, so also skip any tests
267-
# that use multiplexing.
268-
T="$T connection-timeout dynamic-forward forward-control multiplex"
269293
SKIP_LTESTS="$(echo $T)"
270294
TEST_TARGET=t-exec
271295
SUDO=""
@@ -303,6 +327,10 @@ case "$host" in
303327
# modern versions don't ship with libcrypto.
304328
LIBCRYPTOFLAGS="--without-openssl"
305329
TEST_TARGET=t-exec
330+
331+
# On some OS X runners we can't write to /var/empty.
332+
CONFIGFLAGS="${CONFIGFLAGS} --with-privsep-path=/usr/local/empty"
333+
306334
case "$host" in
307335
*-darwin22.*)
308336
# sudo -S nobody doesn't work on macos 13 for some reason.

‎.github/run_test.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set -ex
99
# If we want to test hostbased auth, set up the host for it.
1010
if [ ! -z "$SUDO" ] && [ ! -z "$TEST_SSH_HOSTBASED_AUTH" ]; then
1111
sshconf=/usr/local/etc
12+
$SUDO mkdir -p "${sshconf}"
1213
hostname | $SUDO tee $sshconf/shosts.equiv >/dev/null
1314
echo "EnableSSHKeysign yes" | $SUDO tee $sshconf/ssh_config >/dev/null
1415
$SUDO mkdir -p $sshconf

‎.github/setup_ci.sh‎

Lines changed: 62 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ case "$host" in
1818
;;
1919
*-darwin*)
2020
PACKAGER=brew
21-
brew install automake
22-
exit 0
21+
PACKAGES="automake"
2322
;;
2423
*)
2524
PACKAGER=apt
@@ -30,20 +29,30 @@ TARGETS=$@
3029
INSTALL_FIDO_PPA="no"
3130
export DEBIAN_FRONTEND=noninteractive
3231

33-
#echo "Setting up for '$TARGETS'"
34-
35-
set -ex
32+
set -e
3633

3734
if [ -x "`which lsb_release 2>&1`" ]; then
3835
lsb_release -a
3936
fi
4037

41-
# Ubuntu 22.04 defaults to private home dirs which prevent the
42-
# agent-getpeerid test from running ssh-add as nobody. See
43-
# https://github.com/actions/runner-images/issues/6106
44-
if [ ! -z "$SUDO" ] && ! "$SUDO" -u nobody test -x ~; then
45-
echo ~ is not executable by nobody, adding perms.
46-
chmod go+x ~
38+
if [ ! -z "$SUDO" ]; then
39+
# Ubuntu 22.04 defaults to private home dirs which prevent the
40+
# agent-getpeerid test from running ssh-add as nobody. See
41+
# https://github.com/actions/runner-images/issues/6106
42+
if ! "$SUDO" -u nobody test -x ~; then
43+
echo ~ is not executable by nobody, adding perms.
44+
chmod go+x ~
45+
fi
46+
# Some of the Mac OS X runners don't have a nopasswd sudo rule. Regular
47+
# sudo still works, but sudo -u doesn't. Restore the sudo rule.
48+
if ! "$SUDO" grep -E 'runner.*NOPASSWD' /etc/passwd >/dev/null; then
49+
echo "Restoring runner nopasswd rule to sudoers."
50+
echo 'runner ALL=(ALL) NOPASSWD: ALL' |$SUDO tee -a /etc/sudoers
51+
fi
52+
if ! "$SUDO" -u nobody -S test -x ~ </dev/null; then
53+
echo "Still can't sudo to nobody."
54+
exit 1
55+
fi
4756
fi
4857

4958
if [ "${TARGETS}" = "kitchensink" ]; then
@@ -57,6 +66,7 @@ for flag in $CONFIGFLAGS; do
5766
esac
5867
done
5968

69+
echo "Setting up for '$TARGETS'"
6070
for TARGET in $TARGETS; do
6171
case $TARGET in
6272
default|without-openssl|without-zlib|c89)
@@ -87,7 +97,9 @@ for TARGET in $TARGETS; do
8797
esac
8898
;;
8999
*pam)
90-
PACKAGES="$PACKAGES libpam0g-dev"
100+
case "$PACKAGER" in
101+
apt) PACKAGES="$PACKAGES libpam0g-dev" ;;
102+
esac
91103
;;
92104
sk)
93105
INSTALL_FIDO_PPA="yes"
@@ -116,20 +128,24 @@ for TARGET in $TARGETS; do
116128
1.*) INSTALL_OPENSSL="OpenSSL_$(echo ${INSTALL_OPENSSL} | tr . _)" ;;
117129
3.*) INSTALL_OPENSSL="openssl-${INSTALL_OPENSSL}" ;;
118130
esac
119-
PACKAGES="${PACKAGES} putty-tools"
131+
PACKAGES="${PACKAGES} putty-tools dropbear-bin"
120132
;;
121133
libressl-*)
122134
INSTALL_LIBRESSL=$(echo ${TARGET} | cut -f2 -d-)
123135
case ${INSTALL_LIBRESSL} in
124136
master) ;;
125137
*) INSTALL_LIBRESSL="$(echo ${TARGET} | cut -f2 -d-)" ;;
126138
esac
127-
PACKAGES="${PACKAGES} putty-tools"
139+
PACKAGES="${PACKAGES} putty-tools dropbear-bin"
128140
;;
129141
boringssl)
130142
INSTALL_BORINGSSL=1
131143
PACKAGES="${PACKAGES} cmake ninja-build"
132144
;;
145+
putty-*)
146+
INSTALL_PUTTY=$(echo "${TARGET}" | cut -f2 -d-)
147+
PACKAGES="${PACKAGES} cmake"
148+
;;
133149
valgrind*)
134150
PACKAGES="$PACKAGES valgrind"
135151
;;
@@ -156,6 +172,13 @@ while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
156172
PACKAGES=""
157173
fi
158174
;;
175+
brew)
176+
if [ ! -z "PACKAGES" ]; then
177+
if brew install $PACKAGES; then
178+
PACKAGES=""
179+
fi
180+
fi
181+
;;
159182
setup)
160183
if /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
161184
PACKAGES=""
@@ -176,7 +199,7 @@ if [ "${INSTALL_HARDENED_MALLOC}" = "yes" ]; then
176199
(cd ${HOME} &&
177200
git clone https://github.com/GrapheneOS/hardened_malloc.git &&
178201
cd ${HOME}/hardened_malloc &&
179-
make -j2 && sudo cp out/libhardened_malloc.so /usr/lib/)
202+
make && sudo cp out/libhardened_malloc.so /usr/lib/)
180203
fi
181204

182205
if [ ! -z "${INSTALL_OPENSSL}" ]; then
@@ -197,14 +220,14 @@ if [ ! -z "${INSTALL_LIBRESSL}" ]; then
197220
git checkout ${INSTALL_LIBRESSL} &&
198221
sh update.sh && sh autogen.sh &&
199222
./configure --prefix=/opt/libressl &&
200-
make -j2 && sudo make install)
223+
make && sudo make install)
201224
else
202225
LIBRESSL_URLBASE=https://cdn.openbsd.org/pub/OpenBSD/LibreSSL
203226
(cd ${HOME} &&
204227
wget ${LIBRESSL_URLBASE}/libressl-${INSTALL_LIBRESSL}.tar.gz &&
205228
tar xfz libressl-${INSTALL_LIBRESSL}.tar.gz &&
206229
cd libressl-${INSTALL_LIBRESSL} &&
207-
./configure --prefix=/opt/libressl && make -j2 && sudo make install)
230+
./configure --prefix=/opt/libressl && make && sudo make install)
208231
fi
209232
fi
210233

@@ -222,3 +245,25 @@ if [ ! -z "${INSTALL_ZLIB}" ]; then
222245
cd ${HOME}/zlib && ./configure && make &&
223246
sudo make install prefix=/opt/zlib)
224247
fi
248+
249+
if [ ! -z "${INSTALL_PUTTY}" ]; then
250+
ver="${INSTALL_PUTTY}"
251+
case "${INSTALL_PUTTY}" in
252+
snapshot)
253+
tarball=putty.tar.gz
254+
(cd /tmp && wget https://tartarus.org/~simon/putty-snapshots/${tarball})
255+
;;
256+
*)
257+
tarball=putty-${ver}.tar.gz
258+
(cd /tmp && wget https://the.earth.li/~sgtatham/putty/${ver}/${tarball})
259+
;;
260+
esac
261+
(cd ${HOME} && tar xfz /tmp/${tarball} && cd putty-*
262+
if [ -f CMakeLists.txt ]; then
263+
cmake . && cmake --build . && sudo cmake --build . --target install
264+
else
265+
./configure && make && sudo make install
266+
fi
267+
)
268+
/usr/local/bin/plink -V
269+
fi

‎.github/workflows/c-cpp.yml‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ name: C/C++ CI
22

33
on:
44
push:
5-
paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
5+
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ]
66
pull_request:
7-
paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
7+
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ]
88

99
jobs:
1010
ci:
11+
name: "${{ matrix.target }} ${{ matrix.config }}"
1112
if: github.repository != 'openssh/openssh-portable-selfhosted'
1213
strategy:
1314
fail-fast: false
@@ -19,6 +20,7 @@ jobs:
1920
- macos-11
2021
- macos-12
2122
- macos-13
23+
- macos-14
2224
- windows-2019
2325
- windows-2022
2426
config: [default]
@@ -47,7 +49,8 @@ jobs:
4749
- { target: ubuntu-20.04, config: gcc-7 }
4850
- { target: ubuntu-20.04, config: gcc-8 }
4951
- { target: ubuntu-20.04, config: gcc-10 }
50-
- { target: ubuntu-20.04, config: gcc-11-Werror }
52+
- { target: ubuntu-22.04, config: gcc-11-Werror }
53+
- { target: ubuntu-22.04, config: gcc-12-Werror }
5154
- { target: ubuntu-20.04, config: pam }
5255
- { target: ubuntu-20.04, config: kitchensink }
5356
- { target: ubuntu-22.04, config: hardenedmalloc }
@@ -61,18 +64,35 @@ jobs:
6164
- { target: ubuntu-latest, config: libressl-3.5.3 }
6265
- { target: ubuntu-latest, config: libressl-3.6.1 }
6366
- { target: ubuntu-latest, config: libressl-3.7.2 }
67+
- { target: ubuntu-latest, config: libressl-3.8.4 }
68+
- { target: ubuntu-latest, config: libressl-3.9.1 }
6469
- { target: ubuntu-latest, config: openssl-master }
6570
- { target: ubuntu-latest, config: openssl-noec }
6671
- { target: ubuntu-latest, config: openssl-1.1.1 }
67-
- { target: ubuntu-latest, config: openssl-1.1.1k }
68-
- { target: ubuntu-latest, config: openssl-1.1.1n }
69-
- { target: ubuntu-latest, config: openssl-1.1.1q }
7072
- { target: ubuntu-latest, config: openssl-1.1.1t }
73+
- { target: ubuntu-latest, config: openssl-1.1.1w }
7174
- { target: ubuntu-latest, config: openssl-3.0.0 }
72-
- { target: ubuntu-latest, config: openssl-3.0.7 }
75+
- { target: ubuntu-latest, config: openssl-3.0.13 }
7376
- { target: ubuntu-latest, config: openssl-3.1.0 }
77+
- { target: ubuntu-latest, config: openssl-3.1.5 }
78+
- { target: ubuntu-latest, config: openssl-3.2.1 }
79+
- { target: ubuntu-latest, config: openssl-3.3.0 }
7480
- { target: ubuntu-latest, config: openssl-1.1.1_stable }
7581
- { target: ubuntu-latest, config: openssl-3.0 } # stable branch
82+
- { target: ubuntu-latest, config: openssl-3.1 } # stable branch
83+
- { target: ubuntu-latest, config: openssl-3.2 } # stable branch
84+
- { target: ubuntu-latest, config: openssl-3.3 } # stable branch
85+
- { target: ubuntu-latest, config: putty-0.71 }
86+
- { target: ubuntu-latest, config: putty-0.72 }
87+
- { target: ubuntu-latest, config: putty-0.73 }
88+
- { target: ubuntu-latest, config: putty-0.74 }
89+
- { target: ubuntu-latest, config: putty-0.75 }
90+
- { target: ubuntu-latest, config: putty-0.76 }
91+
- { target: ubuntu-latest, config: putty-0.77 }
92+
- { target: ubuntu-latest, config: putty-0.78 }
93+
- { target: ubuntu-latest, config: putty-0.79 }
94+
- { target: ubuntu-latest, config: putty-0.80 }
95+
- { target: ubuntu-latest, config: putty-snapshot }
7696
- { target: ubuntu-latest, config: zlib-develop }
7797
- { target: ubuntu-22.04, config: pam }
7898
- { target: ubuntu-22.04, config: krb5 }
@@ -85,6 +105,7 @@ jobs:
85105
- { target: macos-11, config: pam }
86106
- { target: macos-12, config: pam }
87107
- { target: macos-13, config: pam }
108+
- { target: macos-14, config: pam }
88109
runs-on: ${{ matrix.target }}
89110
steps:
90111
- name: set cygwin git params
@@ -108,7 +129,7 @@ jobs:
108129
- name: make clean
109130
run: make clean
110131
- name: make
111-
run: make -j2
132+
run: make
112133
- name: make tests
113134
run: sh ./.github/run_test.sh ${{ matrix.config }}
114135
env:

0 commit comments

Comments
 (0)