diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-04-29 16:42:49 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-04-29 16:42:49 -0700 |
| commit | 4b06059785b935dd1f4f09314e4e12c417d2c6a4 (patch) | |
| tree | 051e9f56fab2cd9d368ed15ff4e97c301d5a569c /src/tls | |
| parent | 8da800a193fb6f8832218715f82a7b4e2d2ad338 (diff) | |
| download | android_external_wpa_supplicant_8-4b06059785b935dd1f4f09314e4e12c417d2c6a4.tar.gz android_external_wpa_supplicant_8-4b06059785b935dd1f4f09314e4e12c417d2c6a4.tar.bz2 android_external_wpa_supplicant_8-4b06059785b935dd1f4f09314e4e12c417d2c6a4.zip | |
Accumulative patch from commit b57b560034f1bb1ad3a3892228940dde97323c0e
b57b560 wpa_supplicant: Default to nl80211 instead of wext
ee28f08 hostapd: Add more messages for error paths
61d2ce2 hostapd: Reject configuration file without interface parameter
a8a7890 Clear extra_blacklist_count on FLUSH command
c646862 WPS ER: Allow UPnP interface to be forced
728d971 Use status code 17 (unable to handle new STA) on max-STA limitation
5e24dc8 Add dup_binstr() to help common binary string tasks
8b44ad7 Use os_zalloc() instead of os_malloc() + os_memset()
2c48211 FT RRB: Validate os_malloc() return value before using it
7ca902b Make vlan_file optional if dynamic_vlan is used
bdb112d Add bitfield routines
04382f7 NFC: Add no waiting and no multiple operations options for scripts
fe90496 WPS: Fix AP auto configuration on config token generation
28fcfb6 NFC: Increase wpa_cli command buffer size
8f7a6dd WPS NFC: Allow Device Password ID override for selected registrar
aaecb69 WPS: Use generic MAC Address attribute builder
9ccd916 P2P: Clean up channel--frequency conversion functions
e864c0a Use a common frequency to channel conversion function
02db75b FT: Reset FT flag upon STA deauthentication
7800d45 P2P: Set P2P_DEV_PEER_WAITING_RESPONSE from TX status callback
d78d3c6 EAP peer: Add check before calling getSessionId method
dd57970 Disable network temporarily on repeated connection failures
Change-Id: If8078d5c1ff40ea806e844543cf6f2bf9d24b7ac
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/tls')
| -rw-r--r-- | src/tls/x509v3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c index 87c51784..06540bff 100644 --- a/src/tls/x509v3.c +++ b/src/tls/x509v3.c @@ -443,17 +443,16 @@ static int x509_parse_name(const u8 *buf, size_t len, struct x509_name *name, return -1; } - val = os_malloc(hdr.length + 1); + val = dup_binstr(hdr.payload, hdr.length); if (val == NULL) { x509_free_name(name); return -1; } - os_memcpy(val, hdr.payload, hdr.length); - val[hdr.length] = '\0'; if (os_strlen(val) != hdr.length) { wpa_printf(MSG_INFO, "X509: Reject certificate with " "embedded NUL byte in a string (%s[NUL])", val); + os_free(val); x509_free_name(name); return -1; } |