|
 |
9c84ec |
From 088d53dd15b14a1868b70fd0b8d695ac6b68f642 Mon Sep 17 00:00:00 2001
|
|
|
9c84ec |
Message-Id: <088d53dd15b14a1868b70fd0b8d695ac6b68f642.1488376601.git.dcaratti@redhat.com>
|
|
|
9c84ec |
From: Sabrina Dubroca <sd@queasysnail.net>
|
|
|
9c84ec |
Date: Tue, 15 Nov 2016 18:06:23 +0100
|
|
|
9c84ec |
Subject: [PATCH] mka: Fix getting capabilities from the driver
|
|
|
9c84ec |
|
|
|
9c84ec |
In commit a25e4efc9e428d968e83398bd8c9c94698ba5851 ('mka: Add driver op
|
|
|
9c84ec |
to get macsec capabilities') I added some code to check the driver's
|
|
|
9c84ec |
capabilities. This commit has two problems:
|
|
|
9c84ec |
- wrong enum type set in kay->macsec_confidentiality
|
|
|
9c84ec |
- ignores that drivers could report MACSEC_CAP_NOT_IMPLEMENTED, in
|
|
|
9c84ec |
which case the MKA would claim that MACsec is supported.
|
|
|
9c84ec |
|
|
|
9c84ec |
Fix this by interpreting MACSEC_CAP_NOT_IMPLEMENTED in the same way as a
|
|
|
9c84ec |
DO_NOT_SECURE policy, and set the correct value in
|
|
|
9c84ec |
kay->macsec_confidentiality.
|
|
|
9c84ec |
|
|
|
9c84ec |
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
|
|
|
9c84ec |
---
|
|
|
9c84ec |
src/pae/ieee802_1x_kay.c | 16 +++++++++-------
|
|
|
9c84ec |
1 file changed, 9 insertions(+), 7 deletions(-)
|
|
|
9c84ec |
|
|
|
9c84ec |
diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c
|
|
|
9c84ec |
index 63bbd13..2841b10 100644
|
|
|
9c84ec |
--- a/src/pae/ieee802_1x_kay.c
|
|
|
9c84ec |
+++ b/src/pae/ieee802_1x_kay.c
|
|
|
9c84ec |
@@ -3111,7 +3111,14 @@ ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
|
|
|
9c84ec |
|
|
|
9c84ec |
dl_list_init(&kay->participant_list);
|
|
|
9c84ec |
|
|
|
9c84ec |
- if (policy == DO_NOT_SECURE) {
|
|
|
9c84ec |
+ if (policy != DO_NOT_SECURE &&
|
|
|
9c84ec |
+ secy_get_capability(kay, &kay->macsec_capable) < 0) {
|
|
|
9c84ec |
+ os_free(kay);
|
|
|
9c84ec |
+ return NULL;
|
|
|
9c84ec |
+ }
|
|
|
9c84ec |
+
|
|
|
9c84ec |
+ if (policy == DO_NOT_SECURE ||
|
|
|
9c84ec |
+ kay->macsec_capable == MACSEC_CAP_NOT_IMPLEMENTED) {
|
|
|
9c84ec |
kay->macsec_capable = MACSEC_CAP_NOT_IMPLEMENTED;
|
|
|
9c84ec |
kay->macsec_desired = FALSE;
|
|
|
9c84ec |
kay->macsec_protect = FALSE;
|
|
|
9c84ec |
@@ -3120,11 +3127,6 @@ ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
|
|
|
9c84ec |
kay->macsec_replay_window = 0;
|
|
|
9c84ec |
kay->macsec_confidentiality = CONFIDENTIALITY_NONE;
|
|
|
9c84ec |
} else {
|
|
|
9c84ec |
- if (secy_get_capability(kay, &kay->macsec_capable) < 0) {
|
|
|
9c84ec |
- os_free(kay);
|
|
|
9c84ec |
- return NULL;
|
|
|
9c84ec |
- }
|
|
|
9c84ec |
-
|
|
|
9c84ec |
kay->macsec_desired = TRUE;
|
|
|
9c84ec |
kay->macsec_protect = TRUE;
|
|
|
9c84ec |
kay->macsec_validate = Strict;
|
|
|
9c84ec |
@@ -3133,7 +3135,7 @@ ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
|
|
|
9c84ec |
if (kay->macsec_capable >= MACSEC_CAP_INTEG_AND_CONF)
|
|
|
9c84ec |
kay->macsec_confidentiality = CONFIDENTIALITY_OFFSET_0;
|
|
|
9c84ec |
else
|
|
|
9c84ec |
- kay->macsec_confidentiality = MACSEC_CAP_INTEGRITY;
|
|
|
9c84ec |
+ kay->macsec_confidentiality = CONFIDENTIALITY_NONE;
|
|
|
9c84ec |
}
|
|
|
9c84ec |
|
|
|
9c84ec |
wpa_printf(MSG_DEBUG, "KaY: state machine created");
|
|
|
9c84ec |
--
|
|
|
9c84ec |
2.7.4
|
|
|
9c84ec |
|