DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove unnecessary defines

Browse source 
The following defines are not really needed in most places, so
remove them to clean up source code and build scripts:
EAP_TLS_FUNCS
EAP_TLS_OPENSSL
EAP_TLS_GNUTLS
CONFIG_TLS_INTERNAL
This commit is contained in:
Jouni Malinen 2009-12-05 22:51:08 +02:00
parent 1767f7c117
commit 2d106f21aa
16 changed files with 0 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/crypto/crypto_cryptoapi.c
View file

@ -33,7 +33,6 @@ L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)"
#define CALG_HMAC (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HMAC)
#endif
#ifdef CONFIG_TLS_INTERNAL
#ifdef __MINGW32_VERSION
/*
* MinGW does not yet include all the needed definitions for CryptoAPI, so
@ -98,7 +97,6 @@ static int mingw_load_crypto_func(void)
}
#endif /* __MINGW32_VERSION */
#endif /* CONFIG_TLS_INTERNAL */
static void cryptoapi_report_error(const char *msg)
@ -238,7 +236,6 @@ void des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
}
#ifdef EAP_TLS_FUNCS
int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
{
return cryptoapi_hash_vector(CALG_MD5, 16, num_elem, addr, len, mac);
@ -364,7 +361,6 @@ void aes_decrypt_deinit(void *ctx)
aes_encrypt_deinit(ctx);
}
#ifdef CONFIG_TLS_INTERNAL
struct crypto_hash {
enum crypto_hash_alg alg;
@ -796,7 +792,3 @@ int crypto_global_init(void)
void crypto_global_deinit(void)
{
}
#endif /* CONFIG_TLS_INTERNAL */
#endif /* EAP_TLS_FUNCS */

3
src/crypto/crypto_internal.c
View file

@ -27,8 +27,6 @@
#include "md5_i.h"
#include "des_i.h"
#ifdef CONFIG_TLS_INTERNAL
struct crypto_hash {
enum crypto_hash_alg alg;
union {
@ -543,7 +541,6 @@ int crypto_global_init(void)
void crypto_global_deinit(void)
{
}
#endif /* CONFIG_TLS_INTERNAL */
#ifdef CONFIG_MODEXP

7
src/crypto/crypto_libtomcrypt.c
View file

@ -62,7 +62,6 @@ void des_encrypt(const u8 *clear, const u8 *key, u8 *cypher)
}
#ifdef EAP_TLS_FUNCS
int md5_vector(size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac)
{
hash_state md;
@ -147,8 +146,6 @@ void aes_decrypt_deinit(void *ctx)
}
#ifdef CONFIG_TLS_INTERNAL
struct crypto_hash {
enum crypto_hash_alg alg;
int error;
@ -733,7 +730,3 @@ fail:
}
#endif /* CONFIG_MODEXP */
#endif /* CONFIG_TLS_INTERNAL */
#endif /* EAP_TLS_FUNCS */

2
src/eapol_supp/eapol_supp_sm.c
View file

@ -1854,11 +1854,9 @@ struct eapol_sm *eapol_sm_init(struct eapol_ctx *ctx)
sm->authPeriod = 30;
os_memset(&conf, 0, sizeof(conf));
#ifdef EAP_TLS_OPENSSL
conf.opensc_engine_path = ctx->opensc_engine_path;
conf.pkcs11_engine_path = ctx->pkcs11_engine_path;
conf.pkcs11_module_path = ctx->pkcs11_module_path;
#endif /* EAP_TLS_OPENSSL */
conf.wps = ctx->wps;
sm->eap = eap_peer_sm_init(sm, &eapol_cb, sm->ctx->msg_ctx, &conf);

2
src/eapol_supp/eapol_supp_sm.h
View file

@ -173,7 +173,6 @@ struct eapol_ctx {
*/
void (*aborted_cached)(void *ctx);
#ifdef EAP_TLS_OPENSSL
/**
* opensc_engine_path - Path to the OpenSSL engine for opensc
*
@ -198,7 +197,6 @@ struct eapol_ctx {
* module is not loaded.
*/
const char *pkcs11_module_path;
#endif /* EAP_TLS_OPENSSL */
/**
* wps - WPS context data

2
src/tls/rsa.c
View file

@ -34,7 +34,6 @@ struct crypto_rsa_key {
};
#ifdef EAP_TLS_FUNCS
static const u8 * crypto_rsa_parse_integer(const u8 *pos, const u8 *end,
struct bignum *num)
{
@ -223,7 +222,6 @@ error:
crypto_rsa_free(key);
return NULL;
}
#endif /* EAP_TLS_FUNCS */
/**

6
src/utils/build_config.h
View file

@ -28,7 +28,6 @@
#define CONFIG_ANSI_C_EXTRA
#define CONFIG_WINPCAP
#define IEEE8021X_EAPOL
#define EAP_TLS_FUNCS
#define PKCS12_FUNCS
#define PCSC_FUNCS
#define CONFIG_CTRL_IFACE
@ -48,7 +47,6 @@
#define _CRT_SECURE_NO_DEPRECATE
#ifdef USE_INTERNAL_CRYPTO
#define CONFIG_TLS_INTERNAL
#define CONFIG_TLS_INTERNAL_CLIENT
#define CONFIG_INTERNAL_LIBTOMMATH
#define CONFIG_INTERNAL_X509
@ -65,8 +63,6 @@
#define CONFIG_BACKEND_FILE
#define CONFIG_INTERNAL_LIBTOMMATH
#define CONFIG_INTERNAL_X509
#define EAP_TLS_FUNCS
#define CONFIG_TLS_INTERNAL
#define CONFIG_CRYPTO_INTERNAL
#define IEEE8021X_EAPOL
#define PKCS12_FUNCS
@ -85,7 +81,6 @@
#define CONFIG_DRIVER_OSX
#define CONFIG_BACKEND_FILE
#define IEEE8021X_EAPOL
#define EAP_TLS_FUNCS
#define PKCS12_FUNCS
#define CONFIG_CTRL_IFACE
#define CONFIG_CTRL_IFACE_UNIX
@ -103,7 +98,6 @@
#define EAP_WSC
#ifdef USE_INTERNAL_CRYPTO
#define CONFIG_TLS_INTERNAL
#define CONFIG_TLS_INTERNAL_CLIENT
#define CONFIG_INTERNAL_LIBTOMMATH
#define CONFIG_INTERNAL_X509