← Back to branch summary

~ubuntu-branches/ubuntu/feisty/wpasupplicant/feisty

« back to all changes in this revision

Viewing changes to eap_psk_common.h

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2007-04-01 10:53:37 UTC
  • Revision ID: james.westby@ubuntu.com-20070401105337-3dd89n3g8ecdhjsl
Tags: 0.5.7-0ubuntu2
https://launchpad.net/bugs/98895
https://launchpad.net/bugs/98925
Apply patch from upstream after private email discussion:
http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff;h=33673d3f43da6f5ec0f0aa5a8245a1617b6eb2fd#patch1
Fixes LP: #98895, #98925

Show diffs side-by-side

added added

removed removed

Lines of Context:
eap_psk_common.h
1
1
/*
2
2
 * EAP server/peer: EAP-PSK shared routines
3
 
 * Copyright (c) 2004-2006, Jouni Malinen <jkmaline@cc.hut.fi>
 
3
 * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.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
28
28
#define EAP_PSK_R_FLAG_DONE_FAILURE 3
29
29
#define EAP_PSK_E_FLAG 0x20
30
30
 
31
 
#define EAP_PSK_FLAGS_GET_T(flags) (((flags) & 0xc0) >> 6)
32
 
#define EAP_PSK_FLAGS_SET_T(t) ((u8) (t) << 6)
33
 
 
34
31
#ifdef _MSC_VER
35
32
#pragma pack(push, 1)
36
33
#endif /* _MSC_VER */
97
94
 
98
95
 
99
96
void eap_psk_key_setup(const u8 *psk, u8 *ak, u8 *kdk);
100
 
void eap_psk_derive_keys(const u8 *kdk, const u8 *rand_p, u8 *tek, u8 *msk,
101
 
                         u8 *emsk);
 
97
void eap_psk_derive_keys(const u8 *kdk, const u8 *rand_p, u8 *tek, u8 *msk);
102
98
 
103
99
#endif /* EAP_PSK_COMMON_H */