48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 128f6a98b3d4d6ed103db759707309f451db9682 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <128f6a98b3d4d6ed103db759707309f451db9682.1488376602.git.dcaratti@redhat.com>
|
|
From: Badrish Adiga H R <badrish.adigahr@gmail.com>
|
|
Date: Sat, 18 Feb 2017 05:14:15 -0800
|
|
Subject: [PATCH] mka: Fix the order of operations in secure channel deletion
|
|
|
|
The correct order of deleting a secure channel is to purge all the
|
|
secure associations in the channel before actually deleting the secure
|
|
channel.
|
|
|
|
Signed-off-by: Badrish Adiga H R <badrish.adigahr@gmail.com>
|
|
---
|
|
src/pae/ieee802_1x_kay.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c
|
|
index e420fc1..3f9e53d 100644
|
|
--- a/src/pae/ieee802_1x_kay.c
|
|
+++ b/src/pae/ieee802_1x_kay.c
|
|
@@ -2361,9 +2361,9 @@ static void ieee802_1x_participant_timer(void *eloop_ctx, void *timeout_ctx)
|
|
&participant->rxsc_list,
|
|
struct receive_sc, list) {
|
|
if (sci_equal(&rxsc->sci, &peer->sci)) {
|
|
- secy_delete_receive_sc(kay, rxsc);
|
|
ieee802_1x_kay_deinit_receive_sc(
|
|
participant, rxsc);
|
|
+ secy_delete_receive_sc(kay, rxsc);
|
|
}
|
|
}
|
|
dl_list_del(&peer->list);
|
|
@@ -3432,11 +3432,11 @@ ieee802_1x_kay_delete_mka(struct ieee802_1x_kay *kay, struct mka_key_name *ckn)
|
|
while (!dl_list_empty(&participant->rxsc_list)) {
|
|
rxsc = dl_list_entry(participant->rxsc_list.next,
|
|
struct receive_sc, list);
|
|
- secy_delete_receive_sc(kay, rxsc);
|
|
ieee802_1x_kay_deinit_receive_sc(participant, rxsc);
|
|
+ secy_delete_receive_sc(kay, rxsc);
|
|
}
|
|
- secy_delete_transmit_sc(kay, participant->txsc);
|
|
ieee802_1x_kay_deinit_transmit_sc(participant, participant->txsc);
|
|
+ secy_delete_transmit_sc(kay, participant->txsc);
|
|
|
|
os_memset(&participant->cak, 0, sizeof(participant->cak));
|
|
os_memset(&participant->kek, 0, sizeof(participant->kek));
|
|
--
|
|
2.7.4
|
|
|