Fwd: [PATCH] Changes to make MKA actor Priority configurable

[Badrish Adiga H R]

From: Badrish Adiga H R <badrish.adigahr at gmail.com>

Signed-off-by: Badrish Adiga H R <badrish.adigahr at gmail.com>
---
 src/pae/ieee802_1x_kay.c           |  4 ++--
 src/pae/ieee802_1x_kay.h           |  2 +-
 wpa_supplicant/config.c            |  1 +
 wpa_supplicant/config_file.c       |  1 +
 wpa_supplicant/config_ssid.h       |  5 +++++
 wpa_supplicant/wpa_cli.c           |  1 +
 wpa_supplicant/wpa_supplicant.conf | 11 +++++++----
 wpa_supplicant/wpas_kay.c          |  3 ++-
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c
index e81ae0c..b3bcd43 100644
--- a/src/pae/ieee802_1x_kay.c
+++ b/src/pae/ieee802_1x_kay.c
@@ -3088,7 +3088,7 @@ static void kay_l2_receive(void *ctx, const u8
*src_addr, const u8 *buf,
  */
 struct ieee802_1x_kay *
 ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
-                   u16 port, const char *ifname, const u8 *addr)
+                   u16 port, u8 priority, const char *ifname, const u8 *addr)
 {
        struct ieee802_1x_kay *kay;

@@ -3111,7 +3111,7 @@ ieee802_1x_kay_init(struct ieee802_1x_kay_ctx
*ctx, enum macsec_policy policy,
        os_strlcpy(kay->if_name, ifname, IFNAMSIZ);
        os_memcpy(kay->actor_sci.addr, addr, ETH_ALEN);
        kay->actor_sci.port = host_to_be16(port ? port : 0x0001);
-       kay->actor_priority = DEFAULT_PRIO_NOT_KEY_SERVER;
+       kay->actor_priority = priority;

        /* While actor acts as a key server, shall distribute sakey */
        kay->dist_kn = 1;
diff --git a/src/pae/ieee802_1x_kay.h b/src/pae/ieee802_1x_kay.h
index 9a92d1c..743c5f3 100644
--- a/src/pae/ieee802_1x_kay.h
+++ b/src/pae/ieee802_1x_kay.h
@@ -235,7 +235,7 @@ u64 mka_sci_u64(struct ieee802_1x_mka_sci *sci);

 struct ieee802_1x_kay *
 ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
-                   u16 port, const char *ifname, const u8 *addr);
+                   u16 port, u8 priority, const char *ifname, const u8 *addr);
 void ieee802_1x_kay_deinit(struct ieee802_1x_kay *kay);

 struct ieee802_1x_mka_participant *
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 2120a6e..fd7ea05 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2127,6 +2127,7 @@ static const struct parse_data ssid_fields[] = {
        { INT_RANGE(macsec_policy, 0, 1) },
        { INT_RANGE(macsec_integ_only, 0, 1) },
        { INT_RANGE(macsec_port, 1, 65534) },
+       { INT_RANGE(mka_actor_priority, 1, 255) },
        { FUNC_KEY(mka_cak) },
        { FUNC_KEY(mka_ckn) },
 #endif /* CONFIG_MACSEC */
diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index 2e3d57e..1af8bdf 100644
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -810,6 +810,7 @@ static void wpa_config_write_network(FILE *f,
struct wpa_ssid *ssid)
        write_mka_ckn(f, ssid);
        INT(macsec_integ_only);
        INT(macsec_port);
+       INT(mka_actor_priority);
 #endif /* CONFIG_MACSEC */
 #ifdef CONFIG_HS20
        INT(update_identifier);
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index fe0f7fa..ac5d28e 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -751,6 +751,11 @@ struct wpa_ssid {
        int macsec_port;

        /**
+        * mka_actor_priority - Priority of MKA Actor
+        */
+       u8 mka_actor_priority;
+
+       /**
         * mka_ckn - MKA pre-shared CKN
         */
 #define MACSEC_CKN_LEN 32
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index f11028a..d0b584c 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -1392,6 +1392,7 @@ static const char *network_fields[] = {
        "macsec_policy",
        "macsec_integ_only",
        "macsec_port",
+       "mka_actor_priority",
 #endif /* CONFIG_MACSEC */
 #ifdef CONFIG_HS20
        "update_identifier",
diff --git a/wpa_supplicant/wpa_supplicant.conf
b/wpa_supplicant/wpa_supplicant.conf
index edb230d..3ad2c44 100644
--- a/wpa_supplicant/wpa_supplicant.conf
+++ b/wpa_supplicant/wpa_supplicant.conf
@@ -901,13 +901,16 @@ fast_reauth=1
 # Port component of the SCI
 # Range: 1-65534 (default: 1)
 #
-# mka_cak and mka_ckn: IEEE 802.1X/MACsec pre-shared authentication mode
-# This allows to configure MACsec with a pre-shared key using a (CAK,CKN) pair.
-# In this mode, instances of wpa_supplicant can act as peers, one of
-# which will become the key server and start distributing SAKs.
+# mka_cak, mka_ckn and mka_actor_priority: IEEE 802.1X/MACsec pre-shared
+# authentication mode; This allows to configure MACsec with a pre-shared key
+# using a (CAK,CKN) pair. In this mode, instances of wpa_supplicant can act as
+# MACsec peers. The peer with lower actor priority will become the key server
+# and start distributing SAKs.
 # mka_cak (CAK = Secure Connectivity Association Key) takes a
16-bytes (128 bit)
 # hex-string (32 hex-digits)
 # mka_ckn (CKN = CAK Name) takes a 32-bytes (256 bit) hex-string (64
hex-digits)
+# mka_actor_priority (Priority of MKA Actor) is in 1..255 range with 255 being
+# default priority.
 #
 # mixed_cell: This option can be used to configure whether so called mixed
 # cells, i.e., networks that use both plaintext and encryption in the same
diff --git a/wpa_supplicant/wpas_kay.c b/wpa_supplicant/wpas_kay.c
index d3fefda..cc41c74 100644
--- a/wpa_supplicant/wpas_kay.c
+++ b/wpa_supplicant/wpas_kay.c
@@ -233,7 +233,8 @@ int ieee802_1x_alloc_kay_sm(struct wpa_supplicant
*wpa_s, struct wpa_ssid *ssid)
        kay_ctx->disable_transmit_sa = wpas_disable_transmit_sa;

        res = ieee802_1x_kay_init(kay_ctx, policy, ssid->macsec_port,
-                                 wpa_s->ifname, wpa_s->own_addr);
+                                 ssid->mka_actor_priority, wpa_s->ifname,
+                                 wpa_s->own_addr);
        if (res == NULL) {
                os_free(kay_ctx);
                return -1;
--
2.6.1.133.gf5b6079