commit e7a29d523335b88cacb76ee470b4271c4d48d2da
author Tom Joseph <tomjoseph@in.ibm.com> Thu Apr 26 02:00:49 2018 -0500
committer Andrew Jeffery <andrew@aj.id.au> Thu May 10 16:15:37 2018 +0930
tree 34887f95a80cf60afde6c808542207a69af2d6fd
parent 12fff23b60d79ecb469b630a49c0953b285b71ac

Add the default cipher list for all platforms

The cipher_list.json was added only for Witherspoon platform earlier,
this change will package the json file in the image and related IPMI
commands Get Channel Cipher Suites and Get LAN configuration commands
can succeed.

Resolves openbmc/openbmc#3143

Change-Id: I3b1db52b3c4bc4cff69a521e047872497ddae3dc
Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>

common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb

diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
index 563ed26..aeb1d50 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
@@ -73,6 +73,7 @@
             file://dcmi_cap.json \
             file://power_reading.json \
             file://dcmi_sensors.json \
+            file://cipher_list.json \
             "
 
 HOSTIPMI_PROVIDER_LIBRARY += "libapphandler.so"
@@ -87,6 +88,7 @@
 FILES_${PN}_append = " ${datadir}/ipmi-providers/dcmi_cap.json"
 FILES_${PN}_append = " ${datadir}/ipmi-providers/power_reading.json"
 FILES_${PN}_append = " ${datadir}/ipmi-providers/dcmi_sensors.json"
+FILES_${PN}_append = " ${datadir}/ipmi-providers/cipher_list.json"
 FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
 
 # Soft Power Off
@@ -134,6 +136,8 @@
         ${D}${datadir}/ipmi-providers/power_reading.json
     install -m 0644 -D ${WORKDIR}/dcmi_sensors.json \
         ${D}${datadir}/ipmi-providers/dcmi_sensors.json
+    install -m 0644 -D ${WORKDIR}/cipher_list.json \
+        ${D}${datadir}/ipmi-providers/cipher_list.json
 }
 # python-pyyaml-native is installed by do_configure, so put this task after
 addtask merge_sensors after do_configure before do_compile

common/recipes-phosphor/ipmi/phosphor-ipmi-host/cipher_list.json

diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/cipher_list.json b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/cipher_list.json
new file mode 100644
index 0000000..767fc70
--- /dev/null
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/cipher_list.json
@@ -0,0 +1,14 @@
+{
+    "a":{
+        "cipher":3,
+        "authentication":1,
+        "integrity":1,
+        "confidentiality":1
+    },
+    "b":{
+        "cipher":17,
+        "authentication":3,
+        "integrity":4,
+        "confidentiality":1
+    }
+}