diff options
Diffstat (limited to 'lib/lanplus')
| -rw-r--r-- | lib/lanplus/lanplus.c | 10 | 
1 files changed, 4 insertions, 6 deletions
| diff --git a/lib/lanplus/lanplus.c b/lib/lanplus/lanplus.c index 2fab966..e423ede 100644 --- a/lib/lanplus/lanplus.c +++ b/lib/lanplus/lanplus.c @@ -325,25 +325,23 @@ int lanplus_get_requested_ciphers(int       cipher_suite_id,  		*integrity_alg = IPMI_INTEGRITY_MD5_128;  		*crypt_alg     = IPMI_CRYPT_XRC4_40;  		break; -#if 0 -	case 15: // Note: Cipher Suite ID not (yet) confirmed in IPMI Spec or Errata 4 +#ifdef HAVE_SHA256 +	case 15:  // Note: Cipher Suite ID 15 is in in IPMI Spec or Errata 7  		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;  		*integrity_alg = IPMI_INTEGRITY_NONE;  		*crypt_alg     = IPMI_CRYPT_NONE;  		break; -	case 16: // Note: Cipher Suite ID not (yet) confirmed in IPMI Spec or Errata 4 +	case 16: // Note: Cipher Suite ID 16 is in in IPMI Spec or Errata 7  		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;  		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128;  		*crypt_alg     = IPMI_CRYPT_NONE;  		break; -#endif -#ifdef HAVE_SHA256 -        /* based on an MD5_SHA256 patch from Holger Liebig */  	case 17: // Note: Cipher Suite Id from DCMI 1.1 Spec  		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;  		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128;  		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;  		break; +    /* HAVE_SHA256: based on an MD5_SHA256 patch from Holger Liebig */  #endif  	default:  		lprintf(LOG_ERR, "invalid cipher suite id %d",cipher_suite_id); | 
