diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 23:32:29 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 23:32:29 +0200 |
| commit | 38d4a182b7ccc4a683c1f9bcbe1da7779cc14832 (patch) | |
| tree | 974665e1baf08a8ad70f2fbad970102bd1e7a8c8 /lib/lanplus | |
| parent | 69786de63e325b2f4d9f1afc49b30dcf091b5220 (diff) | |
| parent | 55adddbc16f65732b57ab8585c47001fced91d77 (diff) | |
Merge tag 'upstream/2.9.9'
Upstream version 2.9.9
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); |