diff --git a/ipmitool/include/ipmitool/ipmi_constants.h b/ipmitool/include/ipmitool/ipmi_constants.h index d6bf238..ab503f5 100644 --- a/ipmitool/include/ipmitool/ipmi_constants.h +++ b/ipmitool/include/ipmitool/ipmi_constants.h @@ -94,4 +94,21 @@ #define IPMI_CHANNEL_MEDIUM_USB_2 0xb #define IPMI_CHANNEL_MEDIUM_SYSTEM 0xc +/* From table 13-17 of the IPMI v2 specification */ +#define IPMI_AUTH_RAKP_NONE 0x00 +#define IPMI_AUTH_RAKP_HMAC_SHA1 0x01 +#define IPMI_AUTH_RAKP_HMAC_MD5 0x02 + +/* From table 13-18 of the IPMI v2 specification */ +#define IPMI_INTEGRITY_NONE 0x00 +#define IPMI_INTEGRITY_HMAC_SHA1_96 0x01 +#define IPMI_INTEGRITY_HMAC_MD5_128 0x02 +#define IPMI_INTEGRITY_MD5_128 0x03 + +/* From table 13-19 of the IPMI v2 specfication */ +#define IPMI_CRYPT_NONE 0x00 +#define IPMI_CRYPT_AES_CBC_128 0x01 +#define IPMI_CRYPT_XRC4_128 0x02 +#define IPMI_CRYPT_XRC4_40 0x03 + #endif /*IPMI_CONSTANTS_H*/ diff --git a/ipmitool/src/plugins/lanplus/lanplus.h b/ipmitool/src/plugins/lanplus/lanplus.h index 7cc2261..6cccb9f 100644 --- a/ipmitool/src/plugins/lanplus/lanplus.h +++ b/ipmitool/src/plugins/lanplus/lanplus.h @@ -80,23 +80,6 @@ #define IPMI_PRIV_OEM 5 -/* From table 13-17 of the IPMI v2 specification */ -#define IPMI_AUTH_RAKP_NONE 0x00 -#define IPMI_AUTH_RAKP_HMAC_SHA1 0x01 -#define IPMI_AUTH_RAKP_HMAC_MD5 0x02 - -/* From table 13-18 of the IPMI v2 specification */ -#define IPMI_INTEGRITY_NONE 0x00 -#define IPMI_INTEGRITY_HMAC_SHA1_96 0x01 -#define IPMI_INTEGRITY_HMAC_MD5_128 0x02 -#define IPMI_INTEGRITY_MD5_128 0x03 - -/* From table 13-19 of the IPMI v2 specfication */ -#define IPMI_CRYPT_NONE 0x00 -#define IPMI_CRYPT_AES_CBC_128 0x01 -#define IPMI_CRYPT_XRC4_128 0x02 -#define IPMI_CRYPT_XRC4_40 0x03 - #define IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE 0x10 diff --git a/ipmitool/src/plugins/lanplus/lanplus_crypt_impl.c b/ipmitool/src/plugins/lanplus/lanplus_crypt_impl.c index 130e0ce..4e89d0c 100644 --- a/ipmitool/src/plugins/lanplus/lanplus_crypt_impl.c +++ b/ipmitool/src/plugins/lanplus/lanplus_crypt_impl.c @@ -34,6 +34,7 @@ * facility. */ +#include "ipmitool/ipmi_constants.h" #include "lanplus.h" #include "lanplus_crypt_impl.h" #include