packages/openssh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PubkeyAcceptedKeyTypes has been renamed to PubkeyAcceptedAlgorithms in openssh-8.5p1

Browse Source
This commit is contained in:
renmingshuai 2022-11-28 21:19:45 +08:00
parent 940029c6b1
commit fa75764522
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
feature-add-SMx-support.patch
View File

@ -6,7 +6,7 @@ HostKeyAlgorithms sm2
KexAlgorithms sm2-sm3 KexAlgorithms sm2-sm3
MACs hmac-sm3 MACs hmac-sm3
Ciphers sm4-ctr Ciphers sm4-ctr
PubkeyAcceptedKeyTypes sm2 PubkeyAcceptedAlgorithms sm2
FingerprintHash sm3 FingerprintHash sm3
--- ---
@ -693,16 +693,16 @@ index f187b67..38a0e97 100644
for t in ${SSH_KEYTYPES}; do for t in ${SSH_KEYTYPES}; do
trace "connect via agent using $t key" trace "connect via agent using $t key"
if [ "$t" = "ssh-dss" ]; then if [ "$t" = "ssh-dss" ]; then
+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/ssh_proxy + sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/ssh_proxy
+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/sshd_proxy + sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/sshd_proxy
echo "PubkeyAcceptedAlgorithms +ssh-dss" >> $OBJ/ssh_proxy echo "PubkeyAcceptedAlgorithms +ssh-dss" >> $OBJ/ssh_proxy
echo "PubkeyAcceptedAlgorithms +ssh-dss" >> $OBJ/sshd_proxy echo "PubkeyAcceptedAlgorithms +ssh-dss" >> $OBJ/sshd_proxy
fi fi
+ if [ "$t" = "sm2" ]; then + if [ "$t" = "sm2" ]; then
+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/ssh_proxy + sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/ssh_proxy
+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/sshd_proxy + sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/sshd_proxy
+ echo "PubkeyAcceptedKeyTypes +sm2,sm2-cert" >> $OBJ/ssh_proxy + echo "PubkeyAcceptedAlgorithms +sm2,sm2-cert" >> $OBJ/ssh_proxy
+ echo "PubkeyAcceptedKeyTypes +sm2,sm2-cert" >> $OBJ/sshd_proxy + echo "PubkeyAcceptedAlgorithms +sm2,sm2-cert" >> $OBJ/sshd_proxy
+ fi + fi
+ +
${SSH} -F $OBJ/ssh_proxy -i $OBJ/$t-agent.pub -oIdentitiesOnly=yes \ ${SSH} -F $OBJ/ssh_proxy -i $OBJ/$t-agent.pub -oIdentitiesOnly=yes \

8
openssh.spec
View File

@ -6,7 +6,7 @@
%{?no_gtk2:%global gtk2 0} %{?no_gtk2:%global gtk2 0}
%global sshd_uid 74 %global sshd_uid 74
%global openssh_release 7 %global openssh_release 8
Name: openssh Name: openssh
Version: 8.8p1 Version: 8.8p1
@ -434,6 +434,12 @@ getent passwd sshd >/dev/null || \
%attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
%changelog %changelog
* Mon Nov 28 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-8
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:PubkeyAcceptedKeyTypes has been renamed to PubkeyAcceptedAlgorithms in openssh-8.5p1
* Mon Nov 28 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-7 * Mon Nov 28 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-7
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA