summaryrefslogtreecommitdiff
path: root/debian/patches/20_ipmi_impi.dpatch
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@adonis.trinhall.cam.ac.uk>2009-03-22 16:45:03 +0000
committerMatthew Johnson <mjj29@adonis.trinhall.cam.ac.uk>2009-03-22 16:45:03 +0000
commitc046fdc3b05cb15bc8e599dd9c8604a847c84707 (patch)
tree3c08a8c39f7b81166e096165e158547555d244e5 /debian/patches/20_ipmi_impi.dpatch
parenta30edbecd81e8f5641c6be9397b2e93358b1d72d (diff)
switch to quilt
Diffstat (limited to 'debian/patches/20_ipmi_impi.dpatch')
-rw-r--r--debian/patches/20_ipmi_impi.dpatch340
1 files changed, 0 insertions, 340 deletions
diff --git a/debian/patches/20_ipmi_impi.dpatch b/debian/patches/20_ipmi_impi.dpatch
deleted file mode 100644
index d966a1d..0000000
--- a/debian/patches/20_ipmi_impi.dpatch
+++ /dev/null
@@ -1,340 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20ipmi_impi.dpatch by <mjj29@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 20ipmi_impi, closes #412816
-
-@DPATCH@
-
---- ipmitool-1.8.9-rc1/lib/ipmi_strings.c.orig 2005-05-15 06:26:33.000000000 +0200
-+++ ipmitool-1.8.9-rc1/lib/ipmi_strings.c 2005-10-23 15:22:57.000000000 +0200
-@@ -43,7 +43,7 @@
- /*
- * From table 26-4 of the IPMI v2 specification
- */
--const struct valstr impi_bit_rate_vals[] = {
-+const struct valstr ipmi_bit_rate_vals[] = {
- { 0x00, "IPMI-Over-Serial-Setting"}, /* Using the value in the IPMI Over Serial Config */
- { 0x06, "9.6" },
- { 0x07, "19.2" },
---- ipmitool-1.8.9-rc1/lib/ipmi_sol.c.orig 2006-08-02 19:17:10.000000000 +0200
-+++ ipmitool-1.8.9-rc1/lib/ipmi_sol.c 2006-08-25 16:01:54.000000000 +0200
-@@ -108,7 +108,7 @@
-
- memset(&req, 0, sizeof(req));
- req.msg.netfn = IPMI_NETFN_TRANSPORT;
-- req.msg.cmd = IMPI_GET_SOL_CONFIG_PARAMETERS;
-+ req.msg.cmd = IPMI_GET_SOL_CONFIG_PARAMETERS;
- req.msg.data_len = 4;
- req.msg.data = data;
-
-@@ -485,10 +485,10 @@
- printf("%d,", params.retry_interval * 10);
-
- printf("%s,",
-- val2str(params.volatile_bit_rate, impi_bit_rate_vals));
-+ val2str(params.volatile_bit_rate, ipmi_bit_rate_vals));
-
- printf("%s,",
-- val2str(params.non_volatile_bit_rate, impi_bit_rate_vals));
-+ val2str(params.non_volatile_bit_rate, ipmi_bit_rate_vals));
-
- printf("%d,", params.payload_channel);
- printf("%d\n", params.payload_port);
-@@ -516,10 +516,10 @@
- params.retry_interval * 10);
-
- printf("Volatile Bit Rate (kbps) : %s\n",
-- val2str(params.volatile_bit_rate, impi_bit_rate_vals));
-+ val2str(params.volatile_bit_rate, ipmi_bit_rate_vals));
-
- printf("Non-Volatile Bit Rate (kbps) : %s\n",
-- val2str(params.non_volatile_bit_rate, impi_bit_rate_vals));
-+ val2str(params.non_volatile_bit_rate, ipmi_bit_rate_vals));
-
- printf("Payload Channel : %d (0x%02x)\n",
- params.payload_channel, params.payload_channel);
-@@ -554,7 +554,7 @@
-
- memset(&req, 0, sizeof(req));
- req.msg.netfn = IPMI_NETFN_TRANSPORT; /* 0x0c */
-- req.msg.cmd = IMPI_SET_SOL_CONFIG_PARAMETERS; /* 0x21 */
-+ req.msg.cmd = IPMI_SET_SOL_CONFIG_PARAMETERS; /* 0x21 */
- req.msg.data = data;
-
- data[0] = channel;
-@@ -1105,7 +1105,7 @@
-
-
- /*
-- * impi_sol_deactivate
-+ * ipmi_sol_deactivate
- */
- static int
- ipmi_sol_deactivate(struct ipmi_intf * intf)
-@@ -1451,7 +1451,7 @@
-
-
- /*
-- * impi_sol_activate
-+ * ipmi_sol_activate
- */
- static int
- ipmi_sol_activate(struct ipmi_intf * intf, int looptest, int interval)
---- ipmitool-1.8.9-rc1/include/ipmitool/ipmi_intf.h.orig 2005-04-21 01:03:57.000000000 +0200
-+++ ipmitool-1.8.9-rc1/include/ipmitool/ipmi_intf.h 2005-10-23 16:07:56.000000000 +0200
-@@ -96,7 +96,7 @@
- socklen_t addrlen;
-
- /*
-- * This struct holds state data specific to IMPI v2 / RMCP+ sessions
-+ * This struct holds state data specific to IPMI v2 / RMCP+ sessions
- */
- struct {
- enum LANPLUS_SESSION_STATE session_state;
---- ipmitool-1.8.9-rc1/include/ipmitool/ipmi_user.h.orig 2005-01-07 03:05:45.000000000 +0100
-+++ ipmitool-1.8.9-rc1/include/ipmitool/ipmi_user.h 2005-10-23 16:08:25.000000000 +0200
-@@ -44,7 +44,7 @@
-
-
- /*
-- * The GET USER ACCESS response from table 22-32 of the IMPI v2.0 spec
-+ * The GET USER ACCESS response from table 22-32 of the IPMI v2.0 spec
- */
- struct user_access_rsp {
- #if WORDS_BIGENDIAN
---- ipmitool-1.8.9-rc1/include/ipmitool/ipmi_strings.h.orig 2005-05-11 07:46:40.000000000 +0200
-+++ ipmitool-1.8.9-rc1/include/ipmitool/ipmi_strings.h 2005-10-23 15:22:19.000000000 +0200
-@@ -45,7 +45,7 @@
-
- extern const struct valstr ipmi_channel_activity_type_vals[];
- extern const struct valstr ipmi_privlvl_vals[];
--extern const struct valstr impi_bit_rate_vals[];
-+extern const struct valstr ipmi_bit_rate_vals[];
- extern const struct valstr ipmi_set_in_progress_vals[];
- extern const struct valstr ipmi_authtype_session_vals[];
- extern const struct valstr ipmi_authtype_vals[];
---- ipmitool-1.8.9-rc1/include/ipmitool/ipmi_constants.h.orig 2005-05-11 07:46:40.000000000 +0200
-+++ ipmitool-1.8.9-rc1/include/ipmitool/ipmi_constants.h 2005-10-23 16:08:13.000000000 +0200
-@@ -42,9 +42,9 @@
- * COMMANDS
- */
- #define IPMI_GET_SDR_REPOSITORY_INFO 0x20
--#define IMPI_SOL_ACTIVATING 0x20
--#define IMPI_SET_SOL_CONFIG_PARAMETERS 0x21
--#define IMPI_GET_SOL_CONFIG_PARAMETERS 0x22
-+#define IPMI_SOL_ACTIVATING 0x20
-+#define IPMI_SET_SOL_CONFIG_PARAMETERS 0x21
-+#define IPMI_GET_SOL_CONFIG_PARAMETERS 0x22
- #define IPMI_SET_USER_ACCESS 0x43
- #define IPMI_GET_USER_ACCESS 0x44
- #define IPMI_SET_USER_NAME 0x45
---- ipmitool-1.8.9-rc1/src/plugins/lanplus/lanplus.c.orig 2006-08-03 18:26:06.000000000 +0200
-+++ ipmitool-1.8.9-rc1/src/plugins/lanplus/lanplus.c 2006-08-25 16:06:37.000000000 +0200
-@@ -862,7 +862,7 @@
- /*
- * read_open_session_reponse
- *
-- * Initialize the ipmi_rs from the IMPI 2.x open session response data.
-+ * Initialize the ipmi_rs from the IPMI 2.x open session response data.
- *
- * The offset should point to the first byte of the the Open Session Response
- * payload when this function is called.
-@@ -924,7 +924,7 @@
- /*
- * read_rakp2_message
- *
-- * Initialize the ipmi_rs from the IMPI 2.x RAKP 2 message
-+ * Initialize the ipmi_rs from the IPMI 2.x RAKP 2 message
- *
- * The offset should point the first byte of the the RAKP 2 payload when this
- * function is called.
-@@ -1004,7 +1004,7 @@
- /*
- * read_rakp4_message
- *
-- * Initialize the ipmi_rs from the IMPI 2.x RAKP 4 message
-+ * Initialize the ipmi_rs from the IPMI 2.x RAKP 4 message
- *
- * The offset should point the first byte of the the RAKP 4 payload when this
- * function is called.
-@@ -1212,7 +1212,7 @@
- /*
- * read_ipmi_response
- *
-- * Initialize the impi_rs from with the IPMI response specific data
-+ * Initialize the ipmi_rs from with the IPMI response specific data
- *
- * The offset should point the first byte of the the IPMI payload when this
- * function is called.
-@@ -1244,7 +1244,7 @@
- /*
- * read_sol_packet
- *
-- * Initialize the impi_rs with the SOL response data
-+ * Initialize the ipmi_rs with the SOL response data
- *
- * The offset should point the first byte of the the SOL payload when this
- * function is called.
-@@ -1562,32 +1562,32 @@
- *------------------------------------------
- */
- /* ipmi session Auth Type / Format is always 0x06 for IPMI v2 */
-- msg[IMPI_LANPLUS_OFFSET_AUTHTYPE] = 0x06;
-+ msg[IPMI_LANPLUS_OFFSET_AUTHTYPE] = 0x06;
-
- /* Payload Type -- also specifies whether were authenticated/encyrpted */
-- msg[IMPI_LANPLUS_OFFSET_PAYLOAD_TYPE] = payload->payload_type;
-+ msg[IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE] = payload->payload_type;
-
- if (session->v2_data.session_state == LANPLUS_STATE_ACTIVE)
- {
-- msg[IMPI_LANPLUS_OFFSET_PAYLOAD_TYPE] |=
-+ msg[IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE] |=
- ((session->v2_data.crypt_alg != IPMI_CRYPT_NONE )? 0x80 : 0x00);
-- msg[IMPI_LANPLUS_OFFSET_PAYLOAD_TYPE] |=
-+ msg[IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE] |=
- ((session->v2_data.integrity_alg != IPMI_INTEGRITY_NONE)? 0x40 : 0x00);
- }
-
- if (session->v2_data.session_state == LANPLUS_STATE_ACTIVE)
- {
- /* Session ID -- making it LSB */
-- msg[IMPI_LANPLUS_OFFSET_SESSION_ID ] = session->v2_data.bmc_id & 0xff;
-- msg[IMPI_LANPLUS_OFFSET_SESSION_ID + 1] = (session->v2_data.bmc_id >> 8) & 0xff;
-- msg[IMPI_LANPLUS_OFFSET_SESSION_ID + 2] = (session->v2_data.bmc_id >> 16) & 0xff;
-- msg[IMPI_LANPLUS_OFFSET_SESSION_ID + 3] = (session->v2_data.bmc_id >> 24) & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SESSION_ID ] = session->v2_data.bmc_id & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SESSION_ID + 1] = (session->v2_data.bmc_id >> 8) & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SESSION_ID + 2] = (session->v2_data.bmc_id >> 16) & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SESSION_ID + 3] = (session->v2_data.bmc_id >> 24) & 0xff;
-
- /* Sequence Number -- making it LSB */
-- msg[IMPI_LANPLUS_OFFSET_SEQUENCE_NUM ] = session->out_seq & 0xff;
-- msg[IMPI_LANPLUS_OFFSET_SEQUENCE_NUM + 1] = (session->out_seq >> 8) & 0xff;
-- msg[IMPI_LANPLUS_OFFSET_SEQUENCE_NUM + 2] = (session->out_seq >> 16) & 0xff;
-- msg[IMPI_LANPLUS_OFFSET_SEQUENCE_NUM + 3] = (session->out_seq >> 24) & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM ] = session->out_seq & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM + 1] = (session->out_seq >> 8) & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM + 2] = (session->out_seq >> 16) & 0xff;
-+ msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM + 3] = (session->out_seq >> 24) & 0xff;
- }
-
- /*
-@@ -1679,9 +1679,9 @@
- }
-
- /* Now we know the payload length */
-- msg[IMPI_LANPLUS_OFFSET_PAYLOAD_SIZE ] =
-+ msg[IPMI_LANPLUS_OFFSET_PAYLOAD_SIZE ] =
- payload->payload_length & 0xff;
-- msg[IMPI_LANPLUS_OFFSET_PAYLOAD_SIZE + 1] =
-+ msg[IPMI_LANPLUS_OFFSET_PAYLOAD_SIZE + 1] =
- (payload->payload_length >> 8) & 0xff;
-
-
-@@ -1745,14 +1745,14 @@
- 2;
-
- if (verbose > 2)
-- printbuf(msg + IMPI_LANPLUS_OFFSET_AUTHTYPE, hmac_input_size, "authcode input");
-+ printbuf(msg + IPMI_LANPLUS_OFFSET_AUTHTYPE, hmac_input_size, "authcode input");
-
-
- /* Auth Code */
- lanplus_HMAC(session->v2_data.integrity_alg,
- session->v2_data.k1, /* key */
- 20, /* key length */
-- msg + IMPI_LANPLUS_OFFSET_AUTHTYPE, /* hmac input */
-+ msg + IPMI_LANPLUS_OFFSET_AUTHTYPE, /* hmac input */
- hmac_input_size,
- hmac_output,
- &hmac_length);
-@@ -2529,7 +2529,7 @@
- * ipmi_get_auth_capabilities_cmd
- *
- * This command may have to be sent twice. We first ask for the
-- * authentication capabilities with the "request IMPI v2 data bit"
-+ * authentication capabilities with the "request IPMI v2 data bit"
- * set. If this fails, we send the same command without that bit
- * set.
- *
-@@ -2602,7 +2602,7 @@
-
-
- static int
--impi_close_session_cmd(struct ipmi_intf * intf)
-+ipmi_close_session_cmd(struct ipmi_intf * intf)
- {
- struct ipmi_rs * rsp;
- struct ipmi_rq req;
-@@ -2836,7 +2836,7 @@
- /*
- * ipmi_lanplus_rakp1
- *
-- * Build and send the RAKP 1 message as part of the IMPI v2 / RMCP+ session
-+ * Build and send the RAKP 1 message as part of the IPMI v2 / RMCP+ session
- * negotiation protocol. We also read and validate the RAKP 2 message received
- * from the BMC, here. See section 13.20 of the IPMI v2 specification for
- * details.
-@@ -2990,7 +2990,7 @@
- /*
- * ipmi_lanplus_rakp3
- *
-- * Build and send the RAKP 3 message as part of the IMPI v2 / RMCP+ session
-+ * Build and send the RAKP 3 message as part of the IPMI v2 / RMCP+ session
- * negotiation protocol. We also read and validate the RAKP 4 message received
- * from the BMC, here. See section 13.20 of the IPMI v2 specification for
- * details.
-@@ -3154,7 +3154,7 @@
- ipmi_lanplus_close(struct ipmi_intf * intf)
- {
- if (!intf->abort)
-- impi_close_session_cmd(intf);
-+ ipmi_close_session_cmd(intf);
-
- if (intf->fd >= 0)
- close(intf->fd);
---- ipmitool-1.8.9-rc1/src/plugins/lanplus/lanplus.h.orig 2005-03-17 00:17:37.000000000 +0100
-+++ ipmitool-1.8.9-rc1/src/plugins/lanplus/lanplus.h 2005-10-23 16:09:48.000000000 +0200
-@@ -84,11 +84,11 @@
-
-
- /* Session message offsets, from table 13-8 of the v2 specification */
--#define IMPI_LANPLUS_OFFSET_AUTHTYPE 0x04
--#define IMPI_LANPLUS_OFFSET_PAYLOAD_TYPE 0x05
--#define IMPI_LANPLUS_OFFSET_SESSION_ID 0x06
--#define IMPI_LANPLUS_OFFSET_SEQUENCE_NUM 0x0A
--#define IMPI_LANPLUS_OFFSET_PAYLOAD_SIZE 0x0E
-+#define IPMI_LANPLUS_OFFSET_AUTHTYPE 0x04
-+#define IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE 0x05
-+#define IPMI_LANPLUS_OFFSET_SESSION_ID 0x06
-+#define IPMI_LANPLUS_OFFSET_SEQUENCE_NUM 0x0A
-+#define IPMI_LANPLUS_OFFSET_PAYLOAD_SIZE 0x0E
- #define IPMI_LANPLUS_OFFSET_PAYLOAD 0x10
-
-
---- ipmitool-1.8.9-rc1/src/plugins/lanplus/lanplus_crypt.c.orig 2005-03-24 02:46:03.000000000 +0100
-+++ ipmitool-1.8.9-rc1/src/plugins/lanplus/lanplus_crypt.c 2005-10-23 16:10:06.000000000 +0200
-@@ -800,8 +800,8 @@
- lanplus_HMAC(session->v2_data.integrity_alg,
- session->v2_data.k1,
- IPMI_AUTHCODE_BUFFER_SIZE,
-- rs->data + IMPI_LANPLUS_OFFSET_AUTHTYPE,
-- rs->data_len - IMPI_LANPLUS_OFFSET_AUTHTYPE - IPMI_SHA1_AUTHCODE_SIZE,
-+ rs->data + IPMI_LANPLUS_OFFSET_AUTHTYPE,
-+ rs->data_len - IPMI_LANPLUS_OFFSET_AUTHTYPE - IPMI_SHA1_AUTHCODE_SIZE,
- generated_authcode,
- &generated_authcode_length);
-
-@@ -809,8 +809,8 @@
- {
- lprintf(LOG_DEBUG+2, "Validating authcode");
- printbuf(session->v2_data.k1, 20, "K1");
-- printbuf(rs->data + IMPI_LANPLUS_OFFSET_AUTHTYPE,
-- rs->data_len - IMPI_LANPLUS_OFFSET_AUTHTYPE - IPMI_SHA1_AUTHCODE_SIZE,
-+ printbuf(rs->data + IPMI_LANPLUS_OFFSET_AUTHTYPE,
-+ rs->data_len - IPMI_LANPLUS_OFFSET_AUTHTYPE - IPMI_SHA1_AUTHCODE_SIZE,
- "Authcode Input Data");
- printbuf(generated_authcode, 12, "Generated authcode");
- printbuf(bmc_authcode, 12, "Expected authcode");