Remove experimental Symbian build

This was never really completed and is of not much use at this point,
so clean up the repository by removing the Symbian-specific changes.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/utils/build_config.h b/src/utils/build_config.h
index 04b8d98e413b1d3f8153d933569422df086c83d1..f947388552dbe26c28d0ceb0a5274e2becb22512 100644 (file)
--- a/src/utils/build_config.h
+++ b/src/utils/build_config.h
@@ -47,28 +47,6 @@
 #endif /* USE_INTERNAL_CRYPTO */
 #endif /* CONFIG_WIN32_DEFAULTS */
 
-#ifdef __SYMBIAN32__
-#define OS_NO_C_LIB_DEFINES
-#define CONFIG_ANSI_C_EXTRA
-#define CONFIG_NO_WPA_MSG
-#define CONFIG_NO_HOSTAPD_LOGGER
-#define CONFIG_NO_STDOUT_DEBUG
-#define CONFIG_BACKEND_FILE
-#define CONFIG_INTERNAL_LIBTOMMATH
-#define CONFIG_CRYPTO_INTERNAL
-#define IEEE8021X_EAPOL
-#define PKCS12_FUNCS
-#define EAP_MD5
-#define EAP_TLS
-#define EAP_MSCHAPv2
-#define EAP_PEAP
-#define EAP_TTLS
-#define EAP_GTC
-#define EAP_OTP
-#define EAP_LEAP
-#define EAP_FAST
-#endif /* __SYMBIAN32__ */
-
 #ifdef CONFIG_XCODE_DEFAULTS
 #define CONFIG_DRIVER_OSX
 #define CONFIG_BACKEND_FILE

diff --git a/src/utils/common.h b/src/utils/common.h
index 43ceb543766ca29c7a22c2b5324cf6a9b0bd5079..7f115efe863e89376e3505889924dc5d55f7317b 100644 (file)
--- a/src/utils/common.h
+++ b/src/utils/common.h
@@ -63,12 +63,6 @@ static inline unsigned int bswap_32(unsigned int v)
 #endif
 #endif /* CONFIG_TI_COMPILER */
 
-#ifdef __SYMBIAN32__
-#define __BIG_ENDIAN 4321
-#define __LITTLE_ENDIAN 1234
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif /* __SYMBIAN32__ */
-
 #ifdef CONFIG_NATIVE_WINDOWS
 #include <winsock.h>
 
@@ -132,16 +126,6 @@ typedef unsigned char u8;
 #define WPA_TYPES_DEFINED
 #endif /* CONFIG_TI_COMPILER */
 
-#ifdef __SYMBIAN32__
-#define __REMOVE_PLATSEC_DIAGNOSTICS__
-#include <e32def.h>
-typedef TUint64 u64;
-typedef TUint32 u32;
-typedef TUint16 u16;
-typedef TUint8 u8;
-#define WPA_TYPES_DEFINED
-#endif /* __SYMBIAN32__ */
-
 #ifndef WPA_TYPES_DEFINED
 #ifdef CONFIG_USE_INTTYPES_H
 #include <inttypes.h>

diff --git a/src/utils/includes.h b/src/utils/includes.h
index 787be18628a6be3eadb3e3fe4e1de7947f746e2a..6c6ec87d0eaf43079bb9781dfa3406a466c60644 100644 (file)
--- a/src/utils/includes.h
+++ b/src/utils/includes.h
@@ -41,9 +41,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #ifndef __vxworks
-#ifndef __SYMBIAN32__
 #include <sys/uio.h>
-#endif /* __SYMBIAN32__ */
 #include <sys/time.h>
 #endif /* __vxworks */
 #endif /* CONFIG_TI_COMPILER */

diff --git a/wpa_supplicant/main_symbian.cpp b/wpa_supplicant/main_symbian.cpp
deleted file mode 100644 (file)
index 254fead..0000000
--- a/wpa_supplicant/main_symbian.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * WPA Supplicant / Program entrypoint for Symbian
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "includes.h"
-
-extern "C" {
-#include "common.h"
-#include "wpa_supplicant_i.h"
-}
-
-GLDEF_C TInt E32Main(void)
-{
-       struct wpa_interface iface;
-       int exitcode = 0;
-       struct wpa_params params;
-       struct wpa_global *global;
-
-       memset(&params, 0, sizeof(params));
-       params.wpa_debug_level = MSG_INFO;
-
-       global = wpa_supplicant_init(&params);
-       if (global == NULL)
-               return -1;
-
-       memset(&iface, 0, sizeof(iface));
-       /* TODO: set interface parameters */
-
-       if (wpa_supplicant_add_iface(global, &iface) == NULL)
-               exitcode = -1;
-
-       if (exitcode == 0)
-               exitcode = wpa_supplicant_run(global);
-
-       wpa_supplicant_deinit(global);
-
-       return exitcode;
-}

diff --git a/wpa_supplicant/symbian/README.symbian b/wpa_supplicant/symbian/README.symbian
deleted file mode 100644 (file)
index 9d3b811..0000000
--- a/wpa_supplicant/symbian/README.symbian
+++ /dev/null
@@ -1,24 +0,0 @@
-wpa_supplicant for Symbian
-==========================
-
-Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi> and
-contributors
-All Rights Reserved.
-
-This program is dual-licensed under both the GPL version 2 and BSD
-license. Either license may be used at your option.
-
-
-This directory includes project files for testing experimental Symbian
-(e.g., Nokia S60 3rd Ed) builds. The Symbian port is not really
-complete or expected to work, but these files can be used to verify
-that the build itself can be completed successfully.
-
-These files have been successfully tested with Nokia S60 3rd Edition
-MR SDK.
-
-Build files can be created and a phone release build can be run with
-following commands:
-
-bldmake bldfiles
-abld build gcce urel

diff --git a/wpa_supplicant/symbian/bld.inf b/wpa_supplicant/symbian/bld.inf
deleted file mode 100644 (file)
index a1fc582..0000000
--- a/wpa_supplicant/symbian/bld.inf
+++ /dev/null
@@ -1,8 +0,0 @@
-PRJ_PLATFORMS
-WINSCW GCCE
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-wpa_supplicant.mmp

diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp
deleted file mode 100644 (file)
index e018e05..0000000
--- a/wpa_supplicant/symbian/wpa_supplicant.mmp
+++ /dev/null
@@ -1,38 +0,0 @@
-TARGET         wpa_supplicant.exe
-UID            0x0 0x0
-VENDORID       0
-TARGETTYPE     exe
-
-SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc
-
-USERINCLUDE    .. ..\..\src ..\..\src\utils
-
-SOURCEPATH     ..
-SOURCE         main_symbian.cpp
-SOURCE         config.c config_file.c
-SOURCE         eapol_sm.c
-SOURCE         wpa_supplicant.c events.c
-SOURCEPATH     ..\..\src\rsn_supp
-SOURCE         wpa.c preauth.c pmksa_cache.c peerkey.c wpa_ie.c
-SOURCEPATH     ..\..\src\drivers
-SOURCE         drivers.c driver_common.c
-SOURCEPATH     ..\..\src\common
-SOURCE         wpa_common.c
-SOURCEPATH     ..\..\src\utils
-SOURCE         os_none.c common.c wpa_debug.c eloop_none.c base64.c
-SOURCEPATH     ..\..\src\crypto
-SOURCE         sha1.c md5.c rc4.c des.c aes-cbc.c aes-ctr.c aes-eax.c aes-encblock.c aes-omac1.c aes-unwrap.c aes-wrap.c aes.c ms_funcs.c
-SOURCE         tls_internal.c crypto_internal.c
-SOURCEPATH     ..\..\src\tls
-SOURCE         asn1.c bignum.c rsa.c x509v3.c tlsv1_client.c tlsv1_common.c
-SOURCEPATH     ..\..\src\l2_packet
-SOURCE         l2_packet_none.c
-SOURCEPATH     ..\..\src\eap_peer
-SOURCE         eap.c eap_methods.c
-SOURCE         eap_md5.c eap_tls.c eap_mschapv2.c eap_peap.c eap_gtc.c
-SOURCE         eap_ttls.c eap_otp.c eap_leap.c eap_tls_common.c eap_tlv.c
-SOURCE         eap_fast.c eap_fast_pac.c
-SOURCEPATH     ..\..\src\eap_common
-SOURCE         eap_common.c
-
-LIBRARY                euser.lib estlib.lib