rpms/libssh
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix loglevel regression

Browse Source 
Related: rhbz#2182252, rhbz#2189740

Signed-off-by: Norbert Pocs <npocs@redhat.com>
This commit is contained in:
Norbert Pocs 2023-06-21 18:28:43 +02:00
parent 18eec23532
commit bd00cd22a0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libssh.spec
View File

@ -1,6 +1,6 @@
Name: libssh Name: libssh
Version: 0.10.4 Version: 0.10.4
Release: 10%{?dist} Release: 11%{?dist}
Summary: A library implementing the SSH protocol Summary: A library implementing the SSH protocol
License: LGPLv2+ License: LGPLv2+
URL: http://www.libssh.org URL: http://www.libssh.org
@ -143,6 +143,10 @@ popd
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config
%changelog %changelog
* Wed Jun 21 2023 Norbert Pocs <npocs@redhat.com> - 0.10.4-11
- Fix loglevel regression
- Related: rhbz#2182252, rhbz#2189740
* Mon May 22 2023 Norbert Pocs <npocs@redhat.com> - 0.10.4.10 * Mon May 22 2023 Norbert Pocs <npocs@redhat.com> - 0.10.4.10
- Fix null dereference issues found by covscan - Fix null dereference issues found by covscan
- Related: rhbz#2182252, rhbz#2189740 - Related: rhbz#2182252, rhbz#2189740

6
null_dereference_rekey.patch
View File

@ -196,7 +196,7 @@ diff --color -ru ../libssh-0.10.4/src/client.c ./src/client.c
+ goto error; + goto error;
+ } + }
+ set_status(session, 0.4f); + set_status(session, 0.4f);
+ SSH_LOG(SSH_LOG_PROTOCOL, + SSH_LOG(SSH_LOG_DEBUG,
+ "SSH server banner: %s", session->serverbanner); + "SSH server banner: %s", session->serverbanner);
+ +
+ /* Here we analyze the different protocols the server allows. */ + /* Here we analyze the different protocols the server allows. */
@ -1018,7 +1018,7 @@ diff --color -ru ../libssh-0.10.4/src/kex.c ./src/kex.c
- SSH_LOG(SSH_LOG_DEBUG, "Negotiated %s,%s,%s,%s,%s,%s,%s,%s,%s,%s", - SSH_LOG(SSH_LOG_DEBUG, "Negotiated %s,%s,%s,%s,%s,%s,%s,%s,%s,%s",
+ crypto->kex_type = kex_type; + crypto->kex_type = kex_type;
+ +
+ SSH_LOG(SSH_LOG_INFO, "Negotiated %s,%s,%s,%s,%s,%s,%s,%s,%s,%s", + SSH_LOG(SSH_LOG_DEBUG, "Negotiated %s,%s,%s,%s,%s,%s,%s,%s,%s,%s",
session->next_crypto->kex_methods[SSH_KEX], session->next_crypto->kex_methods[SSH_KEX],
session->next_crypto->kex_methods[SSH_HOSTKEYS], session->next_crypto->kex_methods[SSH_HOSTKEYS],
session->next_crypto->kex_methods[SSH_CRYPT_C_S], session->next_crypto->kex_methods[SSH_CRYPT_C_S],
@ -1386,7 +1386,7 @@ diff --color -ru ../libssh-0.10.4/src/server.c ./src/server.c
+ goto error; + goto error;
+ } + }
+ set_status(session, 0.4f); + set_status(session, 0.4f);
+ SSH_LOG(SSH_LOG_PROTOCOL, + SSH_LOG(SSH_LOG_DEBUG,
+ "SSH client banner: %s", session->clientbanner); + "SSH client banner: %s", session->clientbanner);
+ +
+ /* Here we analyze the different protocols the server allows. */ + /* Here we analyze the different protocols the server allows. */