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

Apply change from RHEL 8 / 9

Browse Source 
Disable retry of pre-session "Get cipher suites" (#1831158)

Reported upstream https://github.com/ipmitool/ipmitool/issues/199
PR https://github.com/ipmitool/ipmitool/pull/214 approved upstream,
but never merged.
This commit is contained in:
Pavel Cahyna 2022-02-07 18:23:55 +01:00
parent 62d1e816dd
commit 6821f1fd25
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0014-lanplus-cipher-retry.patch Normal file
View File

@ -0,0 +1,38 @@
From 9d72def87ecc384d0a46525c766e755068fefe54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <vdolezal@redhat.com>
Date: Thu, 28 May 2020 13:32:31 +0200
Subject: [PATCH] lanplus: don't retry pre-session Get cipher suites
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some BMCs are ignoring it, causing needless delay.
Signed-off-by: Václav Doležal <vdolezal@redhat.com>
---
src/plugins/lanplus/lanplus.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c
index 3087348..c442c0e 100644
--- a/src/plugins/lanplus/lanplus.c
+++ b/src/plugins/lanplus/lanplus.c
@@ -3459,9 +3459,13 @@ ipmi_find_best_cipher_suite(struct ipmi_intf *intf)
};
const size_t nr_preferred = ARRAY_SIZE(cipher_order_preferred);
size_t ipref, i;
+ int rc;
+ int retry_old = intf->ssn_params.retry;
- if (ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E,
- suites, &nr_suites) < 0)
+ ipmi_intf_session_set_retry(intf, 1);
+ rc = ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E, suites, &nr_suites);
+ ipmi_intf_session_set_retry(intf, retry_old);
+ if (rc < 0)
{
/* default legacy behavior - cipher suite 3 if none is requested */
return IPMI_LANPLUS_CIPHER_SUITE_3;
--
2.25.4

3
ipmitool.spec
View File

@ -22,6 +22,9 @@ Patch3: ipmitool-1.8.19-set-kg-key.patch
Patch4: 0004-slowswid.patch
Patch5: 0005-sensor-id-length.patch
Patch7: 0007-check-input.patch
# https://github.com/ipmitool/ipmitool/issues/199
# https://github.com/ipmitool/ipmitool/pull/214 - approved but not merged
Patch14: 0014-lanplus-cipher-retry.patch
BuildRequires: openssl-devel readline-devel ncurses-devel
%{?systemd_requires}