diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-06-04 15:28:27 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-06-04 15:28:27 -0700 |
| commit | b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a (patch) | |
| tree | 0c6b77653c6a1e5c3bb0cdff0843f9d7b85cca36 /src/eap_server | |
| parent | 717574375e969e8272c6d1a26137286eac158abb (diff) | |
| download | android_external_wpa_supplicant_8-b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a.tar.gz android_external_wpa_supplicant_8-b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a.tar.bz2 android_external_wpa_supplicant_8-b5d893b5dec601a58c3ce0fc9e5d6da3816ce97a.zip | |
Cumulative patch from commit 6280df31bbbd015cb857630868a49c373325ba10
6280df3 Include CONTRIBUTIONS file in the release tarballs
b63b9a7 Change version information for the 2.2 release
6a98f67 ChangeLog entries for v2.2
d4b951f Fix offchannel TX not to retransmit pending frame on callback
95b6bca Add rsn_pairwise bits to set_ieee8021x() driver_ops
95f6f6a RADIUS/EAP server: Use longer username buffer to avoid truncation
5dff6df Fix off-by-one bounds checking in printf_encode()
Change-Id: I531fbbb2111da96174b89fd99507716df25bb1e6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eap_server')
| -rw-r--r-- | src/eap_server/eap_server_identity.c | 4 | ||||
| -rw-r--r-- | src/eap_server/eap_server_mschapv2.c | 4 | ||||
| -rw-r--r-- | src/eap_server/eap_server_ttls.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/eap_server/eap_server_identity.c b/src/eap_server/eap_server_identity.c index b3c20873..45015336 100644 --- a/src/eap_server/eap_server_identity.c +++ b/src/eap_server/eap_server_identity.c @@ -120,9 +120,9 @@ static void eap_identity_process(struct eap_sm *sm, void *priv, return; /* Should not happen - frame already validated */ wpa_hexdump_ascii(MSG_DEBUG, "EAP-Identity: Peer identity", pos, len); - buf = os_malloc(len * 3 + 1); + buf = os_malloc(len * 4 + 1); if (buf) { - printf_encode(buf, len * 3 + 1, pos, len); + printf_encode(buf, len * 4 + 1, pos, len); eap_log_msg(sm, "EAP-Response/Identity '%s'", buf); os_free(buf); } diff --git a/src/eap_server/eap_server_mschapv2.c b/src/eap_server/eap_server_mschapv2.c index 790c7195..0eb7908f 100644 --- a/src/eap_server/eap_server_mschapv2.c +++ b/src/eap_server/eap_server_mschapv2.c @@ -330,9 +330,9 @@ static void eap_mschapv2_process_response(struct eap_sm *sm, wpa_printf(MSG_MSGDUMP, "EAP-MSCHAPV2: Flags 0x%x", flags); wpa_hexdump_ascii(MSG_MSGDUMP, "EAP-MSCHAPV2: Name", name, name_len); - buf = os_malloc(name_len * 3 + 1); + buf = os_malloc(name_len * 4 + 1); if (buf) { - printf_encode(buf, name_len * 3 + 1, name, name_len); + printf_encode(buf, name_len * 4 + 1, name, name_len); eap_log_msg(sm, "EAP-MSCHAPV2 Name '%s'", buf); os_free(buf); } diff --git a/src/eap_server/eap_server_ttls.c b/src/eap_server/eap_server_ttls.c index 24225a45..d09a7693 100644 --- a/src/eap_server/eap_server_ttls.c +++ b/src/eap_server/eap_server_ttls.c @@ -985,9 +985,9 @@ static void eap_ttls_process_phase2(struct eap_sm *sm, if (parse.user_name) { char *nbuf; - nbuf = os_malloc(parse.user_name_len * 3 + 1); + nbuf = os_malloc(parse.user_name_len * 4 + 1); if (nbuf) { - printf_encode(nbuf, parse.user_name_len * 3 + 1, + printf_encode(nbuf, parse.user_name_len * 4 + 1, parse.user_name, parse.user_name_len); eap_log_msg(sm, "TTLS-User-Name '%s'", nbuf); |