From 68d0e3ed07847339aedfac8e02f50db68c702e52 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 28 Oct 2013 17:59:21 -0700 Subject: Cumulative patch from commit 32b62704fac6af74f60b2effb173474e11ff089d 32b6270 Android: Fix ARRAY_SIZE() compilation 7617388 Interworking: Report STATUS:sp_type even if domain is not configured c20bc9d P2P: Remove compiler warning without CONFIG_IEEE80211N ca9bc5b P2P: Add VHT support 20ea1ca P2P: Add VHT parameter to P2P operations 53cfad4 nl80211: Mark VHT 80 MHz channels f2112b2 wpa_supplicant: Add CONFIG_IEEE80211AC 6b02335 hostapd: Mask out not-supported VHT capabilities 7f0303d hostapd: Verify VHT 160/80+80 MHz driver support c781eb8 hostapd: Verify VHT capabilities are supported by driver b29b012 Fix some VHT Capabilities definitions 7066a8e hostapd: Fix wrong VHT configuration capabilities flags 6651f1f nl80211: Use max tx power from regulatory domain 7ac3616 nl80211: Replace perror() and printf() calls with wpa_printf() 4d9fb08 WPS: Clear known_wps_freq in addition to after_wps d20c340 Interworking: Clear known_wps_freq for network selection f3be6ee tests: Allow test case descriptions to be written into database 1bd05d0 Interworking: Force normal scan for network selection 51e9f22 P2P: Add option to allow additional client channels 556b30d P2P: Add option to remove channels from GO use e7ecab4 Use ARRAY_SIZE() macro 39044a7 Introduce ARRAY_SIZE() macro 2e94624 DFS: Handle radar event when CAC actived correctly 5eaf240 DFS: Fix overlapped() function to check only DFS channels 345276a DFS: Adjust center freq correctly for VHT20/VHT40 1dc17db DFS: Fix available channels list for VHT80 34068ac nl80211: Add debug prints on nl_recvmsgs() failure 10b8592 nl80211: Make eloop sockets non-blocking 5f65e9f nl80211: Abstract handling of sockets on eloop e8d1168 nl80211: Register for IBSS auth frames before eloop 03610ad Clean up get_seqnum() use for IPN 29179b8 Stop ctrl_iface monitor send loop on reinit failure a2a535f Remove unnecessary wpa_s->conf checks 3318376 Add explicit buffer length checks for p2p_build_wps_ie() 0f01201 Verify that readlink() did not truncate result f5eb9da nl80211: Clean up if_add() for hostapd use a288da6 OpenSSL: Fix memory leak on error path 6cb4f11 nl80211: Fix strerror() value in P2P Dev debug messages 35f8363 DFS: Add forgotten break statement 2f243b8 Remove os_strncpy() 24f051e Replace remainining strncpy() uses with strlcpy() 41c526f P2P: Fix snprintf buffer length for group ifname backup Change-Id: I2e1506cb9219a5a37efbb2ae0dc180fb081c809f Signed-off-by: Dmitry Shmidt --- src/tls/tlsv1_common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/tls') diff --git a/src/tls/tlsv1_common.c b/src/tls/tlsv1_common.c index d2128628..4578b227 100644 --- a/src/tls/tlsv1_common.c +++ b/src/tls/tlsv1_common.c @@ -57,8 +57,7 @@ static const struct tls_cipher_suite tls_cipher_suites[] = { TLS_CIPHER_AES_256_CBC, TLS_HASH_SHA256 } }; -#define NUM_ELEMS(a) (sizeof(a) / sizeof((a)[0])) -#define NUM_TLS_CIPHER_SUITES NUM_ELEMS(tls_cipher_suites) +#define NUM_TLS_CIPHER_SUITES ARRAY_SIZE(tls_cipher_suites) static const struct tls_cipher_data tls_ciphers[] = { @@ -84,7 +83,7 @@ static const struct tls_cipher_data tls_ciphers[] = { CRYPTO_CIPHER_ALG_AES } }; -#define NUM_TLS_CIPHER_DATA NUM_ELEMS(tls_ciphers) +#define NUM_TLS_CIPHER_DATA ARRAY_SIZE(tls_ciphers) /** -- cgit v1.2.3