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

Use char pointers for EAP configuration parameters without length

Browse source 
These parameters were using the u8*/len style types even though they
were used as char* strings without an explicit length field. Make this
char* instead of u8* to avoid confusion and unnecessary type casting.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-03-11 13:17:29 +02:00 committed by Jouni Malinen
parent cd6a5866eb
commit 0173423f41
3 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eap_example/eap_example_peer.c
View file

@ -299,7 +299,7 @@ int eap_example_peer_init(void)
eap_ctx.eap_config.identity_len = 4; eap_ctx.eap_config.identity_len = 4;
eap_ctx.eap_config.password = (u8 *) os_strdup("password"); eap_ctx.eap_config.password = (u8 *) os_strdup("password");
eap_ctx.eap_config.password_len = 8; eap_ctx.eap_config.password_len = 8;
eap_ctx.eap_config.ca_cert = (u8 *) os_strdup("ca.pem"); eap_ctx.eap_config.ca_cert = os_strdup("ca.pem");
eap_ctx.eap_config.fragment_size = 1398; eap_ctx.eap_config.fragment_size = 1398;
os_memset(&eap_cb, 0, sizeof(eap_cb)); os_memset(&eap_cb, 0, sizeof(eap_cb));

28
src/eap_peer/eap_config.h
View file

@ -101,7 +101,7 @@ struct eap_peer_config {
* certificate store (My user account) is used, whereas computer store * certificate store (My user account) is used, whereas computer store
* (Computer account) is used when running wpasvc as a service. * (Computer account) is used when running wpasvc as a service.
*/ */
u8 *ca_cert; char *ca_cert;
/** /**
* ca_path - Directory path for CA certificate files (PEM) * ca_path - Directory path for CA certificate files (PEM)
@ -112,7 +112,7 @@ struct eap_peer_config {
* these certificates are added to the list of trusted CAs. ca_cert * these certificates are added to the list of trusted CAs. ca_cert
* may also be included in that case, but it is not required. * may also be included in that case, but it is not required.
*/ */
u8 *ca_path; char *ca_path;
/** /**
* client_cert - File path to client certificate file (PEM/DER) * client_cert - File path to client certificate file (PEM/DER)
@ -126,7 +126,7 @@ struct eap_peer_config {
* Alternatively, a named configuration blob can be used by setting * Alternatively, a named configuration blob can be used by setting
* this to blob://blob_name. * this to blob://blob_name.
*/ */
u8 *client_cert; char *client_cert;
/** /**
* private_key - File path to client private key file (PEM/DER/PFX) * private_key - File path to client private key file (PEM/DER/PFX)
@ -153,7 +153,7 @@ struct eap_peer_config {
* Alternatively, a named configuration blob can be used by setting * Alternatively, a named configuration blob can be used by setting
* this to blob://blob_name. * this to blob://blob_name.
*/ */
u8 *private_key; char *private_key;
/** /**
* private_key_passwd - Password for private key file * private_key_passwd - Password for private key file
@ -178,7 +178,7 @@ struct eap_peer_config {
* Alternatively, a named configuration blob can be used by setting * Alternatively, a named configuration blob can be used by setting
* this to blob://blob_name. * this to blob://blob_name.
*/ */
u8 *dh_file; char *dh_file;
/** /**
* subject_match - Constraint for server certificate subject * subject_match - Constraint for server certificate subject
@ -194,7 +194,7 @@ struct eap_peer_config {
* to do a suffix match against a possible domain name in the CN entry. * to do a suffix match against a possible domain name in the CN entry.
* For such a use case, domain_suffix_match should be used instead. * For such a use case, domain_suffix_match should be used instead.
*/ */
u8 *subject_match; char *subject_match;
/** /**
* altsubject_match - Constraint for server certificate alt. subject * altsubject_match - Constraint for server certificate alt. subject
@ -212,7 +212,7 @@ struct eap_peer_config {
* *
* Following types are supported: EMAIL, DNS, URI * Following types are supported: EMAIL, DNS, URI
*/ */
u8 *altsubject_match; char *altsubject_match;
/** /**
* domain_suffix_match - Constraint for server domain name * domain_suffix_match - Constraint for server domain name
@ -263,7 +263,7 @@ struct eap_peer_config {
* Alternatively, a named configuration blob can be used by setting * Alternatively, a named configuration blob can be used by setting
* this to blob://blob_name. * this to blob://blob_name.
*/ */
u8 *ca_cert2; char *ca_cert2;
/** /**
* ca_path2 - Directory path for CA certificate files (PEM) (Phase 2) * ca_path2 - Directory path for CA certificate files (PEM) (Phase 2)
@ -277,7 +277,7 @@ struct eap_peer_config {
* This field is like ca_path, but used for phase 2 (inside * This field is like ca_path, but used for phase 2 (inside
* EAP-TTLS/PEAP/FAST tunnel) authentication. * EAP-TTLS/PEAP/FAST tunnel) authentication.
*/ */
u8 *ca_path2; char *ca_path2;
/** /**
* client_cert2 - File path to client certificate file * client_cert2 - File path to client certificate file
@ -290,7 +290,7 @@ struct eap_peer_config {
* Alternatively, a named configuration blob can be used by setting * Alternatively, a named configuration blob can be used by setting
* this to blob://blob_name. * this to blob://blob_name.
*/ */
u8 *client_cert2; char *client_cert2;
/** /**
* private_key2 - File path to client private key file * private_key2 - File path to client private key file
@ -303,7 +303,7 @@ struct eap_peer_config {
* Alternatively, a named configuration blob can be used by setting * Alternatively, a named configuration blob can be used by setting
* this to blob://blob_name. * this to blob://blob_name.
*/ */
u8 *private_key2; char *private_key2;
/** /**
* private_key2_passwd - Password for private key file * private_key2_passwd - Password for private key file
@ -324,7 +324,7 @@ struct eap_peer_config {
* Alternatively, a named configuration blob can be used by setting * Alternatively, a named configuration blob can be used by setting
* this to blob://blob_name. * this to blob://blob_name.
*/ */
u8 *dh_file2; char *dh_file2;
/** /**
* subject_match2 - Constraint for server certificate subject * subject_match2 - Constraint for server certificate subject
@ -332,7 +332,7 @@ struct eap_peer_config {
* This field is like subject_match, but used for phase 2 (inside * This field is like subject_match, but used for phase 2 (inside
* EAP-TTLS/PEAP/FAST tunnel) authentication. * EAP-TTLS/PEAP/FAST tunnel) authentication.
*/ */
u8 *subject_match2; char *subject_match2;
/** /**
* altsubject_match2 - Constraint for server certificate alt. subject * altsubject_match2 - Constraint for server certificate alt. subject
@ -340,7 +340,7 @@ struct eap_peer_config {
* This field is like altsubject_match, but used for phase 2 (inside * This field is like altsubject_match, but used for phase 2 (inside
* EAP-TTLS/PEAP/FAST tunnel) authentication. * EAP-TTLS/PEAP/FAST tunnel) authentication.
*/ */
u8 *altsubject_match2; char *altsubject_match2;
/** /**
* domain_suffix_match2 - Constraint for server domain name * domain_suffix_match2 - Constraint for server domain name

32
src/eap_peer/eap_tls_common.c
View file

@ -108,14 +108,14 @@ static void eap_tls_params_flags(struct tls_connection_params *params,
static void eap_tls_params_from_conf1(struct tls_connection_params *params, static void eap_tls_params_from_conf1(struct tls_connection_params *params,
struct eap_peer_config *config) struct eap_peer_config *config)
{ {
params->ca_cert = (char *) config->ca_cert; params->ca_cert = config->ca_cert;
params->ca_path = (char *) config->ca_path; params->ca_path = config->ca_path;
params->client_cert = (char *) config->client_cert; params->client_cert = config->client_cert;
params->private_key = (char *) config->private_key; params->private_key = config->private_key;
params->private_key_passwd = (char *) config->private_key_passwd; params->private_key_passwd = config->private_key_passwd;
params->dh_file = (char *) config->dh_file; params->dh_file = config->dh_file;
params->subject_match = (char *) config->subject_match; params->subject_match = config->subject_match;
params->altsubject_match = (char *) config->altsubject_match; params->altsubject_match = config->altsubject_match;
params->suffix_match = config->domain_suffix_match; params->suffix_match = config->domain_suffix_match;
params->domain_match = config->domain_match; params->domain_match = config->domain_match;
params->engine = config->engine; params->engine = config->engine;
@ -131,14 +131,14 @@ static void eap_tls_params_from_conf1(struct tls_connection_params *params,
static void eap_tls_params_from_conf2(struct tls_connection_params *params, static void eap_tls_params_from_conf2(struct tls_connection_params *params,
struct eap_peer_config *config) struct eap_peer_config *config)
{ {
params->ca_cert = (char *) config->ca_cert2; params->ca_cert = config->ca_cert2;
params->ca_path = (char *) config->ca_path2; params->ca_path = config->ca_path2;
params->client_cert = (char *) config->client_cert2; params->client_cert = config->client_cert2;
params->private_key = (char *) config->private_key2; params->private_key = config->private_key2;
params->private_key_passwd = (char *) config->private_key2_passwd; params->private_key_passwd = config->private_key2_passwd;
params->dh_file = (char *) config->dh_file2; params->dh_file = config->dh_file2;
params->subject_match = (char *) config->subject_match2; params->subject_match = config->subject_match2;
params->altsubject_match = (char *) config->altsubject_match2; params->altsubject_match = config->altsubject_match2;
params->suffix_match = config->domain_suffix_match2; params->suffix_match = config->domain_suffix_match2;
params->domain_match = config->domain_match2; params->domain_match = config->domain_match2;
params->engine = config->engine2; params->engine = config->engine2;