← Back to branch summary

~ubuntu-branches/ubuntu/precise/wpasupplicant/precise-security

« back to all changes in this revision

Viewing changes to src/rsn_supp/preauth.c

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2009-05-16 03:47:08 UTC
  • mfrom: (4.1.5 karmic)
  • Revision ID: james.westby@ubuntu.com-20090516034708-pkqje2dgvhj6tb2i
Tags: 0.6.9-3
http://bugs.debian.org/528639
Drop debian/patches/12_syslog_supplement.patch. It adds code which
attempts to prettify output but doesn't handle large output well.
(Closes: #528639)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/rsn_supp/preauth.c
1
1
/*
2
2
 * WPA Supplicant - RSN pre-authentication
3
 
 * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
 
3
 * Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi>
4
4
 *
5
5
 * This program is free software; you can redistribute it and/or modify
6
6
 * it under the terms of the GNU General Public License version 2 as
104
104
                        sm->pmk_len = pmk_len;
105
105
                        pmksa_cache_add(sm->pmksa, pmk, pmk_len,
106
106
                                        sm->preauth_bssid, sm->own_addr,
107
 
                                        sm->network_ctx);
 
107
                                        sm->network_ctx,
 
108
                                        WPA_KEY_MGMT_IEEE8021X);
108
109
                } else {
109
110
                        wpa_msg(sm->ctx->ctx, MSG_INFO, "RSN: failed to get "
110
111
                                "master session key from pre-auth EAPOL state "
304
305
        if (sm->preauth_eapol ||
305
306
            sm->proto != WPA_PROTO_RSN ||
306
307
            wpa_sm_get_state(sm) != WPA_COMPLETED ||
307
 
            sm->key_mgmt != WPA_KEY_MGMT_IEEE8021X) {
 
308
            (sm->key_mgmt != WPA_KEY_MGMT_IEEE8021X &&
 
309
             sm->key_mgmt != WPA_KEY_MGMT_IEEE8021X_SHA256)) {
308
310
                wpa_msg(sm->ctx->ctx, MSG_DEBUG, "RSN: not in suitable state "
309
311
                        "for new pre-authentication");
310
312
                return; /* invalid state for new pre-auth */