diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-11-03 10:43:38 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-11-03 10:43:38 +0000 |
| commit | e0d70c33109c041ff2046fe529eb8e3c0f2acec1 (patch) | |
| tree | bf6082c2ad69b06fcb45c37be7157b66ffbd4fc7 /contrib/wpa/src/tls/tlsv1_client.c | |
| parent | 6ddde2168bc79a10ab0937ba69afe0a74559eea0 (diff) | |
| parent | 14ab4e9475c66439a7a011706ada056765de1555 (diff) | |
| download | FreeBSD-src-e0d70c33109c041ff2046fe529eb8e3c0f2acec1.zip FreeBSD-src-e0d70c33109c041ff2046fe529eb8e3c0f2acec1.tar.gz | |
Merge wpa_supplicant and hostapd 0.7.3.
Diffstat (limited to 'contrib/wpa/src/tls/tlsv1_client.c')
| -rw-r--r-- | contrib/wpa/src/tls/tlsv1_client.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/wpa/src/tls/tlsv1_client.c b/contrib/wpa/src/tls/tlsv1_client.c index 0bf1174..afb6031 100644 --- a/contrib/wpa/src/tls/tlsv1_client.c +++ b/contrib/wpa/src/tls/tlsv1_client.c @@ -15,8 +15,8 @@ #include "includes.h" #include "common.h" -#include "sha1.h" -#include "tls.h" +#include "crypto/sha1.h" +#include "crypto/tls.h" #include "tlsv1_common.h" #include "tlsv1_record.h" #include "tlsv1_client.h" @@ -605,7 +605,6 @@ int tlsv1_client_get_keyblock_size(struct tlsv1_client *conn) */ int tlsv1_client_set_cipher_list(struct tlsv1_client *conn, u8 *ciphers) { -#ifdef EAP_FAST size_t count; u16 *suites; @@ -635,9 +634,6 @@ int tlsv1_client_set_cipher_list(struct tlsv1_client *conn, u8 *ciphers) } return 0; -#else /* EAP_FAST */ - return -1; -#endif /* EAP_FAST */ } |
