wpa_supplicant config for WPA2

[Grant]

Should this be sufficient for connecting to hostapd running WPA2:

network={
       ssid="networkname"
       key_mgmt=WPA-PSK
       psk="longrandompassword"
       proto=WPA2
       pairwise=CCMP
       group=CCMP
}

If so, maybe I should try upgrading from hostapd-0.5.10 to hostapd-0.6.7?

- Grant