Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/wpa_supplicant/patches/0004-Prevent-installation-of-an-all-zero-TK.patch

    Annotation of /trunk/wpa_supplicant/patches/0004-Prevent-installation-of-an-all-zero-TK.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2999 - (hide annotations) (download)
    Tue Oct 17 10:55:21 2017 UTC (6 years, 8 months ago) by niro
    File size: 2566 byte(s) 
    -krackattack patches
    1 niro 2999 From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001
    2     From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
    3     Date: Fri, 29 Sep 2017 04:22:51 +0200
    4     Subject: [PATCH 4/8] Prevent installation of an all-zero TK
    5    
    6     Properly track whether a PTK has already been installed to the driver
    7     and the TK part cleared from memory. This prevents an attacker from
    8     trying to trick the client into installing an all-zero TK.
    9    
    10     This fixes the earlier fix in commit
    11     ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the
    12     driver in EAPOL-Key 3/4 retry case') which did not take into account
    13     possibility of an extra message 1/4 showing up between retries of
    14     message 3/4.
    15    
    16     Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be>
    17     ---
    18     src/common/wpa_common.h | 1 +
    19     src/rsn_supp/wpa.c | 5 ++---
    20     src/rsn_supp/wpa_i.h | 1 -
    21     3 files changed, 3 insertions(+), 4 deletions(-)
    22    
    23     diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
    24     index d200285..1021ccb 100644
    25     --- a/src/common/wpa_common.h
    26     +++ b/src/common/wpa_common.h
    27     @@ -215,6 +215,7 @@ struct wpa_ptk {
    28     size_t kck_len;
    29     size_t kek_len;
    30     size_t tk_len;
    31     + int installed; /* 1 if key has already been installed to driver */
    32     };
    33    
    34     struct wpa_gtk {
    35     diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
    36     index 7a2c68d..0550a41 100644
    37     --- a/src/rsn_supp/wpa.c
    38     +++ b/src/rsn_supp/wpa.c
    39     @@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm,
    40     os_memset(buf, 0, sizeof(buf));
    41     }
    42     sm->tptk_set = 1;
    43     - sm->tk_to_set = 1;
    44    
    45     kde = sm->assoc_wpa_ie;
    46     kde_len = sm->assoc_wpa_ie_len;
    47     @@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
    48     enum wpa_alg alg;
    49     const u8 *key_rsc;
    50    
    51     - if (!sm->tk_to_set) {
    52     + if (sm->ptk.installed) {
    53     wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
    54     "WPA: Do not re-install same PTK to the driver");
    55     return 0;
    56     @@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
    57    
    58     /* TK is not needed anymore in supplicant */
    59     os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
    60     - sm->tk_to_set = 0;
    61     + sm->ptk.installed = 1;
    62    
    63     if (sm->wpa_ptk_rekey) {
    64     eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL);
    65     diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
    66     index 9a54631..41f371f 100644
    67     --- a/src/rsn_supp/wpa_i.h
    68     +++ b/src/rsn_supp/wpa_i.h
    69     @@ -24,7 +24,6 @@ struct wpa_sm {
    70     struct wpa_ptk ptk, tptk;
    71     int ptk_set, tptk_set;
    72     unsigned int msg_3_of_4_ok:1;
    73     - unsigned int tk_to_set:1;
    74     u8 snonce[WPA_NONCE_LEN];
    75     u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
    76     int renew_snonce;
    77     --
    78     2.7.4
    79