Browse Source

EAP peer: Use 32-bit EAP method type for Phase 2 processing

This is a step towards enabling expanded EAP header within Phase 2 EAP
methods.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen 10 years ago
parent
commit
a867082cb8
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/eap_peer/eap.c
  2. 1 1
      src/eap_peer/eap_tls_common.c

+ 1 - 1
src/eap_peer/eap.c

@@ -2400,7 +2400,7 @@ static int eap_allowed_phase2_type(int vendor, int type)
 u32 eap_get_phase2_type(const char *name, int *vendor)
 u32 eap_get_phase2_type(const char *name, int *vendor)
 {
 {
 	int v;
 	int v;
-	u8 type = eap_peer_get_type(name, &v);
+	u32 type = eap_peer_get_type(name, &v);
 	if (eap_allowed_phase2_type(v, type)) {
 	if (eap_allowed_phase2_type(v, type)) {
 		*vendor = v;
 		*vendor = v;
 		return type;
 		return type;

+ 1 - 1
src/eap_peer/eap_tls_common.c

@@ -998,7 +998,7 @@ int eap_peer_select_phase2_methods(struct eap_peer_config *config,
 {
 {
 	char *start, *pos, *buf;
 	char *start, *pos, *buf;
 	struct eap_method_type *methods = NULL, *_methods;
 	struct eap_method_type *methods = NULL, *_methods;
-	u8 method;
+	u32 method;
 	size_t num_methods = 0, prefix_len;
 	size_t num_methods = 0, prefix_len;
 
 
 	if (config == NULL || config->phase2 == NULL)
 	if (config == NULL || config->phase2 == NULL)