Skip to content

Commit 15b6f41

Browse files
rapier1rapier1
committed
Release of HPN-18.5.0 incorporating OpenSSH 9.8p1
This release brings HPN-SSH up to OpenSSH 9.8 which brings along all of the changes in OpenSSH. This includes changes to the hpnsshd server; specifically splitting the server into relative barebones listener and a hpnsshd-session client that handles the user interaction on the server side. There are limited changes to HPN-SSH itself aside from a minor change to the versioning to make it RFC compliant. Thanks to Lupo Luchini for pointing this out.
2 parents 52bc5fd + 4585f91 commit 15b6f41

Some content is hidden

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

114 files changed

+5078
-3054
lines changed

‎.depend

+13-8
Large diffs are not rendered by default.

‎.git_allowed_signers

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
[email protected] ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKecyjh9aNmD4rb8WblA8v91JjRb0Cd2JtkzqxcggGeG
2+
[email protected] [email protected] AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBDV81zWQ1+XVfWH5z4L4klDQ/z/6l2GLphfSTX/Rmq6kL5H8mkfzUlryxLlkN8cD9srtVJBAmwJWfJBNsCo958YAAAAEc3NoOg==
3+
24
[email protected] [email protected] AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLnJo3ZVDENYZGXm5uO9lU7b0iDFq5gHpTu1MaHPWTEfPdvw+AjFQQ/q5YizuMJkXGsMdYmblJEJZYHpm9IS7ZkAAAAEc3NoOg==
35
[email protected] [email protected] AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJoAXBTQalfg+kC5wy1vE7HkIHtVnmV6AUuuIo9KQ1P+70juHwvsFKpsGaqQbrHJkTVgYDGVP02XHj8+Fb18yBIAAAAEc3NoOg==
46
[email protected] [email protected] AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBH+z1I48s6ydOhP5SJmI02zVCLf0K15B+UMHgoTIKVfUIv5oDoVX7e9f+7QiRmTeEOdZfQydiaVqsfi7qPSve+0AAAAEc3NoOg==

‎.git_allowed_signers.asc

+13-13
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

+3-7
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

+5-1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ case "$config" in
210210
# and hostbased (since valgrind won't let ssh exec keysign).
211211
# Slow ones are run separately to increase parallelism.
212212
SKIP_LTESTS="agent-timeout connection-timeout hostbased"
213+
SKIP_LTESTS="$SKIP_LTESTS penalty-expire"
213214
SKIP_LTESTS="$SKIP_LTESTS ${tests2} ${tests3} ${tests4} ${tests5} ${tests6} ${tests7}"
214215
;;
215216
valgrind-2)
@@ -297,7 +298,7 @@ case "${TARGET_HOST}" in
297298
hostkey-agent key-options keyscan knownhosts-command login-timeout
298299
reconfigure reexec rekey scp scp-uri scp3 sftp sftp-badcmds
299300
sftp-batch sftp-cmds sftp-glob sftp-perm sftp-uri stderr-data
300-
transfer"
301+
transfer penalty penalty-expire"
301302
SKIP_LTESTS="$(echo $T)"
302303
TEST_TARGET=t-exec
303304
SUDO=""
@@ -321,6 +322,9 @@ case "${TARGET_HOST}" in
321322
# No sudo on Windows.
322323
SUDO=""
323324
;;
325+
windows*)
326+
SUDO=""
327+
;;
324328
esac
325329

326330
host=`./config.guess`

‎.github/run_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +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/hpnssh
12-
$SUDO mkdir -p $sshconf
12+
$SUDO mkdir -p "${sshconf}"
1313
hostname | $SUDO tee $sshconf/shosts.equiv >/dev/null
1414
echo "EnableSSHKeysign yes" | $SUDO tee $sshconf/ssh_config >/dev/null
1515
$SUDO cp -p /etc/ssh/ssh_host*key* $sshconf

‎.github/setup_ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ case "$host" in
1414
echo Removing extended ACLs so umask works as expected.
1515
setfacl -b . regress
1616
PACKAGES="$PACKAGES,autoconf,automake,cygwin-devel,gcc-core"
17-
PACKAGES="$PACKAGES,make,openssl-devel,zlib-devel"
17+
PACKAGES="$PACKAGES,make,openssl,libssl-devel,zlib-devel"
1818
;;
1919
*-darwin*)
2020
PACKAGER=brew

‎.github/workflows/c-cpp.yml

+42-28
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ name: C/C++ CI
33
on:
44
push:
55
branches: [ master, pre-stage, release_candidates, dev_major, dev_minor ]
6-
paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
6+
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ]
77
pull_request:
88
branches: [ master, release_candidates ]
9-
paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
9+
paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ]
1010

1111
jobs:
1212
ci:
13+
name: "${{ matrix.target }} ${{ matrix.config }}"
1314
if: github.repository != 'openssh/openssh-portable-selfhosted'
1415
strategy:
1516
fail-fast: false
@@ -18,42 +19,58 @@ jobs:
1819
target:
1920
- ubuntu-20.04
2021
- ubuntu-22.04
21-
- macos-11
22+
- ubuntu-24.04
2223
- macos-12
2324
- macos-13
25+
- macos-14
26+
- windows-2019
27+
- windows-2022
2428
config: [default]
2529
# Then we include any extra configs we want to test for specific VMs.
2630
include:
27-
- { target: ubuntu-20.04, config: valgrind-1 }
28-
- { target: ubuntu-20.04, config: valgrind-2 }
29-
- { target: ubuntu-20.04, config: valgrind-3 }
30-
- { target: ubuntu-20.04, config: valgrind-4 }
31-
# - { target: ubuntu-20.04, config: valgrind-5 }
32-
- { target: ubuntu-20.04, config: valgrind-6 }
33-
- { target: ubuntu-20.04, config: valgrind-7 }
31+
- { target: windows-2019, config: cygwin-release }
32+
- { target: windows-2022, config: cygwin-release }
33+
- { target: ubuntu-22.04, config: valgrind-1 }
34+
- { target: ubuntu-22.04, config: valgrind-2 }
35+
- { target: ubuntu-22.04, config: valgrind-3 }
36+
- { target: ubuntu-22.04, config: valgrind-4 }
37+
# - { target: ubuntu-22.04, config: valgrind-5 }
38+
- { target: ubuntu-22.04, config: valgrind-6 }
39+
- { target: ubuntu-22.04, config: valgrind-7 }
40+
- { target: ubuntu-22.04, config: valgrind-unit }
3441
# binn.c no longer works with c89 so remove this test.
35-
# - { target: ubuntu-20.04, config: c89 }
42+
# - { target: ubuntu-22.04, config: c89 }
3643
- { target: ubuntu-20.04, config: clang-6.0 }
3744
- { target: ubuntu-20.04, config: clang-8 }
3845
- { target: ubuntu-20.04, config: clang-9 }
3946
- { target: ubuntu-20.04, config: clang-10 }
4047
- { target: ubuntu-20.04, config: clang-11 }
4148
- { target: ubuntu-20.04, config: clang-12-Werror }
49+
- { target: ubuntu-20.04, config: clang-sanitize-address }
50+
- { target: ubuntu-20.04, config: clang-sanitize-undefined }
51+
- { target: ubuntu-20.04, config: gcc-sanitize-address }
52+
- { target: ubuntu-20.04, config: gcc-sanitize-undefined }
4253
- { target: ubuntu-20.04, config: gcc-7 }
4354
- { target: ubuntu-20.04, config: gcc-8 }
4455
- { target: ubuntu-20.04, config: gcc-10 }
4556
- { target: ubuntu-22.04, config: gcc-11-Werror }
4657
- { target: ubuntu-22.04, config: gcc-12-Werror }
47-
- { target: ubuntu-20.04, config: pam }
48-
- { target: ubuntu-20.04, config: kitchensink }
58+
- { target: ubuntu-22.04, config: pam }
59+
- { target: ubuntu-22.04, config: kitchensink }
4960
- { target: ubuntu-22.04, config: hardenedmalloc }
5061
- { target: ubuntu-20.04, config: tcmalloc }
62+
- { target: ubuntu-22.04, config: krb5 }
63+
- { target: ubuntu-22.04, config: heimdal }
64+
- { target: ubuntu-22.04, config: libedit }
65+
- { target: ubuntu-22.04, config: sk }
66+
- { target: ubuntu-22.04, config: selinux }
67+
- { target: ubuntu-22.04, config: without-openssl }
5168
# musl doesn't work because it doesn't know about linux/tcp.h
5269
# - { target: ubuntu-20.04, config: musl }
5370
- { target: ubuntu-latest, config: libressl-master }
5471
- { target: ubuntu-latest, config: libressl-3.7.2 }
55-
- { target: ubuntu-latest, config: libressl-3.8.3 }
56-
- { target: ubuntu-latest, config: libressl-3.9.0 }
72+
- { target: ubuntu-latest, config: libressl-3.8.4 }
73+
- { target: ubuntu-latest, config: libressl-3.9.1 }
5774
- { target: ubuntu-latest, config: openssl-master }
5875
- { target: ubuntu-latest, config: openssl-noec }
5976
- { target: ubuntu-latest, config: openssl-1.1.1 }
@@ -64,9 +81,12 @@ jobs:
6481
- { target: ubuntu-latest, config: openssl-3.1.0 }
6582
- { target: ubuntu-latest, config: openssl-3.1.5 }
6683
- { target: ubuntu-latest, config: openssl-3.2.1 }
84+
- { target: ubuntu-latest, config: openssl-3.3.0 }
6785
- { target: ubuntu-latest, config: openssl-1.1.1_stable }
6886
- { target: ubuntu-latest, config: openssl-3.0 } # stable branch
87+
- { target: ubuntu-latest, config: openssl-3.1 } # stable branch
6988
- { target: ubuntu-latest, config: openssl-3.2 } # stable branch
89+
- { target: ubuntu-latest, config: openssl-3.3 } # stable branch
7090
- { target: ubuntu-latest, config: putty-0.71 }
7191
- { target: ubuntu-latest, config: putty-0.72 }
7292
- { target: ubuntu-latest, config: putty-0.73 }
@@ -79,25 +99,19 @@ jobs:
7999
- { target: ubuntu-latest, config: putty-0.80 }
80100
- { target: ubuntu-latest, config: putty-snapshot }
81101
- { target: ubuntu-latest, config: zlib-develop }
82-
- { target: ubuntu-22.04, config: pam }
83-
- { target: ubuntu-22.04, config: krb5 }
84-
- { target: ubuntu-22.04, config: heimdal }
85-
- { target: ubuntu-22.04, config: libedit }
86-
- { target: ubuntu-22.04, config: sk }
87-
- { target: ubuntu-22.04, config: selinux }
88-
- { target: ubuntu-22.04, config: kitchensink }
89-
- { target: ubuntu-22.04, config: without-openssl }
90-
- { target: ubuntu-22.04, config: clang-sanitize-address }
91-
- { target: ubuntu-22.04, config: clang-sanitize-undefined }
92-
- { target: ubuntu-22.04, config: gcc-sanitize-address }
93-
- { target: ubuntu-22.04, config: gcc-sanitize-undefined }
94102
# we know pam doesn't work because we can't install a new pam file
95103
# for hpnssh via the CI test methods
96-
# - { target: macos-11, config: pam }
97104
# - { target: macos-12, config: pam }
98105
# - { target: macos-13, config: pam }
106+
# - { target: macos-14, config: pam }
99107
runs-on: ${{ matrix.target }}
100108
steps:
109+
- name: set cygwin git params
110+
if: ${{ startsWith(matrix.target, 'windows') }}
111+
run: git config --global core.autocrlf input
112+
- name: install cygwin
113+
if: ${{ startsWith(matrix.target, 'windows') }}
114+
uses: cygwin/cygwin-install-action@master
101115
- uses: actions/checkout@main
102116
- name: setup CI system
103117
run: sh ./.github/setup_ci.sh ${{ matrix.config }}

‎.github/workflows/cifuzz.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches: [master, dev_minor, dev_major, release_candidates]
55
paths: [ '**.c', '**.h', '**.m4', '**.sh', '.github/**', '**/Makefile.in', 'configure.ac' ]
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/cifuzz.yml' ]
88

99
jobs:
1010
Fuzzing:

‎.github/workflows/selfhosted.yml

+39-16
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,25 @@ name: C/C++ CI self-hosted
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/selfhosted.yml' ]
66

77
jobs:
88
selfhosted:
9+
name: "${{ matrix.target }} ${{ matrix.config }}"
910
if: github.repository == 'openssh/openssh-portable-selfhosted'
1011
runs-on: ${{ matrix.host }}
1112
timeout-minutes: 600
1213
env:
14+
DEBUG_ACTIONS: false
1315
HOST: ${{ matrix.host }}
1416
TARGET_HOST: ${{ matrix.target }}
1517
TARGET_CONFIG: ${{ matrix.config }}
18+
TARGET_DOMAIN: ${{ startsWith(matrix.host, 'libvirt') && format('{0}-{1}-{2}', matrix.target, matrix.config, github.run_id) || matrix.target }}
19+
EPHEMERAL: ${{ startsWith(matrix.host, 'libvirt') }}
20+
PERSISTENT: ${{ startsWith(matrix.host, 'persist') }}
21+
REMOTE: ${{ startsWith(matrix.host, 'remote') }}
22+
VM: ${{ startsWith(matrix.host, 'libvirt') || startsWith(matrix.host, 'persist') }}
23+
SSHFS: ${{ startsWith(matrix.host, 'libvirt') || startsWith(matrix.host, 'persist') || startsWith(matrix.host, 'remote') }}
1624
strategy:
1725
fail-fast: false
1826
# We use a matrix in two parts: firstly all of the VMs are tested with the
@@ -74,34 +82,46 @@ jobs:
7482
- { target: nbsd8, config: pam, host: libvirt }
7583
- { target: nbsd9, config: pam, host: libvirt }
7684
- { target: nbsd10, config: pam, host: libvirt }
85+
# ARM64 VMs
86+
- { target: obsd-arm64, config: default, host: libvirt-arm64 }
7787
# VMs with persistent disks that have their own runner.
78-
- { target: win10, config: default, host: win10 }
79-
- { target: win10, config: cygwin-release, host: win10 }
80-
# Physical hosts, with either native runners or remote via ssh.
88+
- { target: win10, config: default, host: persist-win10 }
89+
- { target: win10, config: cygwin-release, host: persist-win10 }
90+
# Physical hosts with native runners.
8191
- { target: ARM, config: default, host: ARM }
8292
- { target: ARM64, config: default, host: ARM64 }
8393
- { target: ARM64, config: pam, host: ARM64 }
84-
- { target: debian-riscv64, config: default, host: debian-riscv64 }
85-
- { target: obsd-arm64, config: default, host: obsd-arm64 }
86-
- { target: openwrt-mips, config: default, host: openwrt-mips }
87-
- { target: openwrt-mipsel, config: default, host: openwrt-mipsel }
94+
# Physical hosts with remote runners.
95+
- { target: debian-riscv64, config: default, host: remote-debian-riscv64 }
96+
97+
- { target: openwrt-mips, config: default, host: remote-openwrt-mips }
98+
- { target: openwrt-mipsel, config: default, host: remote-openwrt-mipsel }
8899
steps:
100+
- name: unmount stale workspace
101+
if: env.SSHFS == 'true'
102+
run: fusermount -u ${GITHUB_WORKSPACE} || true
103+
working-directory: ${{ runner.temp }}
89104
- name: shutdown VM if running
105+
if: env.VM == 'true'
90106
run: vmshutdown
91-
working-directory: ${{ runner.temp }}
92107
- uses: actions/checkout@main
93108
- name: autoreconf
94109
run: autoreconf
95110
- name: startup VM
111+
if: env.VM == 'true'
96112
run: vmstartup
97113
working-directory: ${{ runner.temp }}
114+
- name: copy and mount workspace
115+
if: env.SSHFS == 'true'
116+
run: sshfs_mount
117+
working-directory: ${{ runner.temp }}
98118
- name: configure
99119
run: vmrun ./.github/configure.sh ${{ matrix.config }}
100-
- name: save config
101-
uses: actions/upload-artifact@main
102-
with:
103-
name: ${{ matrix.target }}-${{ matrix.config }}-config
104-
path: config.h
120+
# - name: save config
121+
# uses: actions/upload-artifact@main
122+
# with:
123+
# name: ${{ matrix.target }}-${{ matrix.config }}-config
124+
# path: config.h
105125
- name: make clean
106126
run: vmrun make clean
107127
- name: make
@@ -120,7 +140,10 @@ jobs:
120140
regress/*.log
121141
regress/log/*
122142
regress/valgrind-out/
143+
- name: unmount workspace
144+
if: always() && env.SSHFS == 'true'
145+
run: fusermount -u ${GITHUB_WORKSPACE} || true
146+
working-directory: ${{ runner.temp }}
123147
- name: shutdown VM
124-
if: always()
148+
if: always() && env.VM == 'true'
125149
run: vmshutdown
126-
working-directory: ${{ runner.temp }}

‎.gitignore

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
Makefile
22
buildpkg.sh
33
config.h
4-
config.h.in
54
config.h.in~
65
config.log
76
config.status
8-
configure
9-
aclocal.m4
107
openbsd-compat/Makefile
118
openbsd-compat/regress/Makefile
129
openssh.xml
1310
opensshd.init
1411
survey.sh
15-
**/*.0
1612
**/*.o
1713
**/*.lo
1814
**/*.so
@@ -48,3 +44,13 @@ hpnssh-keysign
4844
hpnssh-pkcs11-helper
4945
hpnssh-sk-helper
5046
hpnsshd
47+
!regress/misc/fuzz-harness/Makefile
48+
!regress/unittests/sshsig/Makefile
49+
tags
50+
51+
# Ignored on main branch
52+
config.h.in
53+
configure
54+
aclocal.m4
55+
ChangeLog
56+
**/*.0

‎.skipped-commit-ids

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ f9a0726d957cf10692a231996a1f34e7f9cdfeb0 moduli update
2929
1e0a2692b7e20b126dda60bf04999d1d30d959d8 sshd relinking makefile changes
3030
e1dc11143f83082e3154d6094f9136d0dc2637ad more relinking makefile tweaks
3131
5a636f6ca7f25bfe775df4952f7aac90a7fcbbee moduli update
32+
ef9341d5a50f0d33e3a6fbe995e92964bc7ef2d3 Makefile relinking changes
33+
2fe8d707ae35ba23c7916adcb818bb5b66837ba0 ssh-agent relink kit
34+
866cfcc1955aef8f3fc32da0b70c353a1b859f2e ssh-agent relink changes
35+
8b3820adb4da4e139c4b3cffbcc0bde9f08bf0c6 sshd-session relink kit
36+
6d2ded4cd91d4d727c2b26e099b91ea935bed504 relink kit
37+
fb39324748824cb0387e9d67c41d1bef945c54ea Makefile change
38+
5f378c38ad8976d507786dc4db9283a879ec8cd0 Makefile change
39+
112aacedd3b61cc5c34b1fa6d9fb759214179172 Makefile change
3240

3341
Old upstream tree:
3442

0 commit comments

Comments
 (0)