From 282127483427acc5e06ecd048c6f169464cb6b5a Mon Sep 17 00:00:00 2001 From: renmingshuai Date: Mon, 28 Nov 2022 21:05:03 +0800 Subject: [PATCH] PubkeyAcceptedKeyTypes has been renamed to PubkeyAcceptedAlgorithms in openssh-8.5p1 Signed-off-by: renmingshuai --- feature-add-SMx-support.patch | 14 +++++++------- openssh.spec | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/feature-add-SMx-support.patch b/feature-add-SMx-support.patch index ce2d766..41a14db 100644 --- a/feature-add-SMx-support.patch +++ b/feature-add-SMx-support.patch @@ -6,7 +6,7 @@ HostKeyAlgorithms sm2 KexAlgorithms sm2-sm3 MACs hmac-sm3 Ciphers sm4-ctr -PubkeyAcceptedKeyTypes sm2 +PubkeyAcceptedAlgorithms sm2 FingerprintHash sm3 --- @@ -693,16 +693,16 @@ index f187b67..38a0e97 100644 for t in ${SSH_KEYTYPES}; do trace "connect via agent using $t key" if [ "$t" = "ssh-dss" ]; then -+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/ssh_proxy -+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/sshd_proxy ++ sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/ssh_proxy ++ sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/sshd_proxy echo "PubkeyAcceptedAlgorithms +ssh-dss" >> $OBJ/ssh_proxy echo "PubkeyAcceptedAlgorithms +ssh-dss" >> $OBJ/sshd_proxy fi + if [ "$t" = "sm2" ]; then -+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/ssh_proxy -+ sed -i "/PubkeyAcceptedKeyTypes/d" $OBJ/sshd_proxy -+ echo "PubkeyAcceptedKeyTypes +sm2,sm2-cert" >> $OBJ/ssh_proxy -+ echo "PubkeyAcceptedKeyTypes +sm2,sm2-cert" >> $OBJ/sshd_proxy ++ sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/ssh_proxy ++ sed -i "/PubkeyAcceptedAlgorithms/d" $OBJ/sshd_proxy ++ echo "PubkeyAcceptedAlgorithms +sm2,sm2-cert" >> $OBJ/ssh_proxy ++ echo "PubkeyAcceptedAlgorithms +sm2,sm2-cert" >> $OBJ/sshd_proxy + fi + ${SSH} -F $OBJ/ssh_proxy -i $OBJ/$t-agent.pub -oIdentitiesOnly=yes \ diff --git a/openssh.spec b/openssh.spec index a774314..508e403 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 11 +%global openssh_release 12 Name: openssh Version: 8.8p1 @@ -455,6 +455,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Mon Nov 28 2022 renmingshuai - 8.8p1-12 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:PubkeyAcceptedKeyTypes has been renamed to PubkeyAcceptedAlgorithms in openssh-8.5p1 + * Mon Nov 28 2022 renmingshuai - 8.8p1-11 - Type:bugfix - CVE:NA -- Gitee