← Back to branch summary

~ubuntu-branches/ubuntu/vivid/wpasupplicant/vivid

« back to all changes in this revision

Viewing changes to eap_psk_common.c

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2008-03-12 20:03:04 UTC
  • mfrom: (1.1.10 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20080312200304-4331y9wj46pdd34z
Tags: 0.6.3-1
http://bugs.debian.org/466910
* New upstream release.
* Drop patches applied upstream:
  - debian/patches/30_wpa_gui_qt4_eventhistoryui_rework.patch
  - debian/patches/31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
  - debian/patches/32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
  - debian/patches/40_dbus_ssid_data.patch
* Tidy up the clean target of debian/rules. Now that the madwifi headers are
  handled differently we no longer need to do any cleanup.
* Fix formatting error in debian/ifupdown/wpa_action.8 to make lintian
  quieter.
* Add patch to fix formatting errors in manpages build from sgml source. Use
  <emphasis> tags to hightlight keywords instead of surrounding them in
  strong quotes.
  - debian/patches/41_manpage_format_fixes.patch
* wpasupplicant binary package no longer suggests pcscd, guessnet, iproute
  or wireless-tools, nor does it recommend dhcp3-client. These are not
  needed.
* Add debian/patches/10_silence_siocsiwauth_icotl_failure.patch to disable
  ioctl failure messages that occur under normal conditions.
* Cherry pick two upstream git commits concerning the dbus interface:
  - debian/patches/11_avoid_dbus_version_namespace.patch
  - debian/patches/12_fix_potential_use_after_free.patch
* Add debian/patches/42_manpage_explain_available_drivers.patch to explain
  that not all of the driver backends are available in the provided
  wpa_supplicant binary, and that the canonical list of supported driver
  backends can be retrieved from the wpa_supplicant -h (help) output.
  (Closes: #466910)
* Add debian/patches/20_wpa_gui_qt4_disable_link_prl.patch to remove
  link_prl CONFIG compile flag added by qmake-qt4 >= 4.3.4-2 to avoid excess
  linking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
eap_psk_common.c
1
 
/*
2
 
 * EAP server/peer: EAP-PSK shared routines
3
 
 * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
4
 
 *
5
 
 * This program is free software; you can redistribute it and/or modify
6
 
 * it under the terms of the GNU General Public License version 2 as
7
 
 * published by the Free Software Foundation.
8
 
 *
9
 
 * Alternatively, this software may be distributed under the terms of BSD
10
 
 * license.
11
 
 *
12
 
 * See README and COPYING for more details.
13
 
 */
14
 
 
15
 
#include "includes.h"
16
 
 
17
 
#include "common.h"
18
 
#include "aes_wrap.h"
19
 
#include "eap_defs.h"
20
 
#include "eap_psk_common.h"
21
 
 
22
 
#define aes_block_size 16
23
 
 
24
 
 
25
 
void eap_psk_key_setup(const u8 *psk, u8 *ak, u8 *kdk)
26
 
{
27
 
        os_memset(ak, 0, aes_block_size);
28
 
        aes_128_encrypt_block(psk, ak, ak);
29
 
        os_memcpy(kdk, ak, aes_block_size);
30
 
        ak[aes_block_size - 1] ^= 0x01;
31
 
        kdk[aes_block_size - 1] ^= 0x02;
32
 
        aes_128_encrypt_block(psk, ak, ak);
33
 
        aes_128_encrypt_block(psk, kdk, kdk);
34
 
}
35
 
 
36
 
 
37
 
void eap_psk_derive_keys(const u8 *kdk, const u8 *rand_p, u8 *tek, u8 *msk,
38
 
                         u8 *emsk)
39
 
{
40
 
        u8 hash[aes_block_size];
41
 
        u8 counter = 1;
42
 
        int i;
43
 
 
44
 
        aes_128_encrypt_block(kdk, rand_p, hash);
45
 
 
46
 
        hash[aes_block_size - 1] ^= counter;
47
 
        aes_128_encrypt_block(kdk, hash, tek);
48
 
        hash[aes_block_size - 1] ^= counter;
49
 
        counter++;
50
 
 
51
 
        for (i = 0; i < EAP_MSK_LEN / aes_block_size; i++) {
52
 
                hash[aes_block_size - 1] ^= counter;
53
 
                aes_128_encrypt_block(kdk, hash, &msk[i * aes_block_size]);
54
 
                hash[aes_block_size - 1] ^= counter;
55
 
                counter++;
56
 
        }
57
 
 
58
 
        for (i = 0; i < EAP_EMSK_LEN / aes_block_size; i++) {
59
 
                hash[aes_block_size - 1] ^= counter;
60
 
                aes_128_encrypt_block(kdk, hash, &emsk[i * aes_block_size]);
61
 
                hash[aes_block_size - 1] ^= counter;
62
 
                counter++;
63
 
        }
64
 
}